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

Add macOS ARM64 (Apple Silicon) support. #60

Merged
merged 1 commit into from Sep 28, 2021

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Mar 9, 2021

No description provided.

@connorshea
Copy link

FWIW I'm using the dylib linked in the description on my M1 MacBook Pro and everything seems to be working correctly from what I've tested so far.

@connorshea
Copy link

And it looks like the godot-cpp repo has a PR that's been merged to add ARM support on macOS now? (different from the PR linked in this one's description)

@bruvzg
Copy link
Member Author

bruvzg commented Aug 8, 2021

And it looks like the godot-cpp repo has a PR that's been merged to add ARM support on macOS now? (different from the PR linked in this one's description)

It is, but without godotengine/godot-cpp#587, there's no way to build both architectures without an extra hack (copying godot-cpp files around, to avoid it overwriting it). Also, it will need extra lipo call, since merged PR do not have support for universal builds.

@Calinou
Copy link
Member

Calinou commented Sep 27, 2021

Should this PR be merged now? We can run the lipo step manually on CI to create an universal library, as long as we know the exact command to use.

@twaritwaikar
Copy link
Member

The scons option names added in https://github.com/godotengine/godot-cpp/pull/584/files seem to be different than the ones mentioned in this PR, but it doesn't seem hard to port these changes to suit the changes that were finally merged into godot-cpp because thanks to this PR we know where we need the architecture changes

@bruvzg
Copy link
Member Author

bruvzg commented Sep 28, 2021

Updated to the last godot-cpp changes, now it should work.
Fresh binary for testeing: libgitapi.dylib.zip

@bruvzg bruvzg marked this pull request as ready for review September 28, 2021 05:03
@twaritwaikar
Copy link
Member

The current build failure in mac just seems to be related to using the build config argument that goes into build_libs_mac.sh. I guess it just needs to use $1 instead release or debug in the file path.

There is a catch here that $1 is documented to be Release or Debug instead of their lowercase counterparts

Copy link
Member

@twaritwaikar twaritwaikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! I didn't have an M1 system but since people have already tested the builds, this helps a ton!

@twaritwaikar twaritwaikar merged commit e9f0844 into godotengine:master Sep 28, 2021
@bruvzg bruvzg deleted the macos_m1 branch September 28, 2021 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants