Skip to content

vcpkg dependency builds for macOS#25

Merged
Gymnasiast merged 9 commits intoOpenRCT2:masterfrom
LRFLEW:vcpkg-osx
Dec 12, 2020
Merged

vcpkg dependency builds for macOS#25
Gymnasiast merged 9 commits intoOpenRCT2:masterfrom
LRFLEW:vcpkg-osx

Conversation

@LRFLEW
Copy link
Contributor

@LRFLEW LRFLEW commented Nov 19, 2020

It's been a while. Since my last PR to vcpkg was finally closed, I've been trying to get this working. This is using vcpkg a bit outside of the supported use case (macOS dynamic library builds are not officially supported), but it seems to be stable enough that it shouldn't be a huge issue. I got a number of the dependencies working, but some will require port updates in vcpkg to work correctly. Here's the current status of what I'm missing:

I haven't been following the changes in the project much recently, so I might be very likely missing something. I think I have everything based on the current dependencies release for macOS. With this change, it could also be an opportunity to add other dependencies that have been on a "wishlist", such as discord-rpc, so let me know if there's anything else you want me to look into for this.

@LRFLEW LRFLEW marked this pull request as draft November 20, 2020 01:02
@LRFLEW
Copy link
Contributor Author

LRFLEW commented Nov 26, 2020

The most recent push has the script referring to my fork of vcpkg and using my branch where I have all my outstanding PR's merged in. With this, the PR should be testable while we wait for the upstream changes. I expect the release ZIPs to be the files in vcpkg/installed/x64-osx-openrct2/. It's a little bit more than necessary, but as long as symlinks are repsected when ZIPing, it shouldn't be too much.

@LRFLEW
Copy link
Contributor Author

LRFLEW commented Dec 11, 2020

Ok, everything is merged up-stream in vcpkg except for one thing. Since that one PR seems to be held up by a larger refactor, I added a patch here that has the bug fix required for this to work. The patch can be removed once the upstream issue gets patched. This is ready to be reviewed now.

There is room to add more libraries to this build if there are any that should be added. I added discord-rpc, as there seems to a need for it based on OpenRCT2/OpenRCT2#13558. I also disabled the use of Brotli in freetype2, which can be re-enabled if support for WOFF2 fonts is desired. We could also consider using Brotli instead of Zlib for save compression when connecting to servers if we add it to the build.

Let me know if there are any other libraries you would want added to the build, and I can check if there are any upstream patches required to make the dylib-id and min macOS version work correctly.

@LRFLEW LRFLEW marked this pull request as ready for review December 11, 2020 06:14
@LRFLEW LRFLEW changed the title [WIP] vcpkg dependency builds for macOS vcpkg dependency builds for macOS Dec 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants