Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow the game to build on OSX #77413

Merged
merged 1 commit into from
Nov 6, 2024

Conversation

johannes-graner
Copy link
Contributor

Summary

Build "Allow the game to build on OSX"

Purpose of change

The game did not compile on OSX, neither locally nor in experimental release GH action, due to the Makefile not linking the freetype2 library. Closes #77410.

Describe the solution

Include and link the library when building for OSX.

Describe alternatives you've considered

Figuring out if there is a reason why this is not included for all tiles builds, regardless of operating system. I'll leave that to someone with more experience of the makefile, and I don't want to break what isn't broken.

Testing

Compiles locally. Removing the obj/tiles/third-party/imgui directory and recompiling works fine.

Additional context

@github-actions github-actions bot added Code: Build Issues regarding different builds and build environments <Bugfix> This is a fix for a bug (or closes open issue) new contributor json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Oct 28, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 29, 2024
@johannes-graner
Copy link
Contributor Author

Doesn't seem to work very nicely for building a universal binary. I don't have much C++ experience, and even less time to get this to work properly. If someone wants to figure out how to get the dynamic library working for both x86_64 and arm64 at the same time, feel free to do so, but I'll close this PR in the meantime.

@Ivan-Shestakov
Copy link
Contributor

plugging these two lines in - allowed me to complete the build, thanks!

@katemonster33
Copy link
Contributor

@johannes-graner hi friend, i think your fix here is correct, would you mind reopening this? Regarding the build failures youre talking about with arm64, can you list your error message?

@johannes-graner
Copy link
Contributor Author

@johannes-graner hi friend, i think your fix here is correct, would you mind reopening this? Regarding the build failures youre talking about with arm64, can you list your error message?

Hi! Sure, I can reopen the PR, but I don't think. I can finish it. The relevant failure is at this CI step, which only shows up when building a universal binary. I have an arm64 Mac, and I can build fine locally as long as I omit UNIVERSAL_BINARY=1 from the make command.

Makefile Show resolved Hide resolved
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 5, 2024
@akrieger
Copy link
Member

akrieger commented Nov 5, 2024

Hey, thanks for this fix. We can go ahead and commit this once basic build passes, I have followup fixes that will fix our mac ci builds.

@akrieger akrieger merged commit 99bd819 into CleverRaven:master Nov 6, 2024
32 of 45 checks passed
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 6, 2024
@johannes-graner johannes-graner deleted the fix-osx-build branch November 6, 2024 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Code: Build Issues regarding different builds and build environments json-styled JSON lint passed, label assigned by github actions new contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to compile on MacOS
4 participants