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

Compile macOS Intel Version on Apple Silicon #656

Merged
merged 16 commits into from
Dec 18, 2024

Conversation

halprin
Copy link
Contributor

@halprin halprin commented Dec 16, 2024

Pull Request Type

  • GitHub Workflow changes
  • Documentation or Wiki changes
  • Build and Dependency changes
  • Runtime changes
    • Render changes
    • Audio changes
    • Input changes
    • Network changes
    • Other changes

Description

Eventually the GitHub runner macos-13 will be deprecated and removed by GitHub. This work is to get the macOS Intel version to compile with the Apple Silicon macos-14 runner. This work is also the first step towards making a universal (fat) binary that contains both Apple Silicon and Intel architectures in one binary.

Related Issues

None.

Screenshots (if applicable)

None.

Checklist

  • I have tested my changes locally and verified that they work as intended.
  • I have documented any new or modified functionality.
  • I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
  • I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

Additional Comments

None.

@halprin halprin marked this pull request as ready for review December 16, 2024 04:17
@halprin
Copy link
Contributor Author

halprin commented Dec 16, 2024

It works! The Intel version continues to contain Intel binaries, the Apple Silicon version continues to contain Apple Silicon binaries, and both run on my Apple Silicon based Mac. This is now ready for review.

.github/workflows/build.yml Outdated Show resolved Hide resolved
Copy link
Member

@Lgt2x Lgt2x left a comment

Choose a reason for hiding this comment

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

Good job! I can't test it but I'll trust you that the generated binaries work properly :)

@Lgt2x Lgt2x merged commit 72f51b0 into DescentDevelopers:main Dec 18, 2024
12 checks passed
@Lgt2x
Copy link
Member

Lgt2x commented Dec 18, 2024

woops I forgot to squash... too bad

@halprin halprin deleted the macos-rosetta branch December 18, 2024 14:36
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.

2 participants