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

Bump MacOS CMake target to MacOS 13 #320

Merged
merged 2 commits into from
Aug 1, 2024

Conversation

OpenSauce04
Copy link
Member

No description provided.

The minimum required MacOS version for Lime3DS was already MacOS 13 due to dependencies, but until now the compilation target was set to MacOS 11
@OpenSauce04 OpenSauce04 force-pushed the macos-13-cmake-target branch from 59c7a82 to 305b67a Compare July 31, 2024 12:09
@OpenSauce04 OpenSauce04 added this to the 2117 milestone Jul 31, 2024
@OpenSauce04
Copy link
Member Author

Unsure why this is failing specifically on x86_64. I'm not entirely sure what changing the MacOS target version actually does, so I'll have to do a bit of research on this later. The error isn't particularly helpful.

@rtiangha
Copy link
Collaborator

rtiangha commented Jul 31, 2024

I'm not sure why it fails when the OSX version is bumped up, but it's an issue with Zydis that's since been fixed. See zyantific/zydis#350 and zyantific/zydis#474.

So the answer is to update the Zydis dependency used in the dynarmic version that Lime3DS uses. You could also use or fork my master branch; I keep the dependencies somewhat up-to-date:

https://github.com/rtiangha/dynarmic

Or fork PabloMK7's branch and manually update Zydis (since I can't remember if I had to make changes on the Citra side to play nicely with some of the newer dependencies either; it was a while ago).

@OpenSauce04
Copy link
Member Author

Seeing as you're already putting in the work, I don't see any reason not to use yours.
I'll update the dependency tomorrow evening and try compiling this PR again.

@rtiangha
Copy link
Collaborator

I'm testing it now with the Lime3DS codebase. When it's done compiling, I'll post the results. I think it should work with the master branch with no mods on this end; if not, I'll figure out why and how to fix (I can't remember if I ran into issues with Xbyak or fmt conflicts that required a minor cmake change to bump up or set a policy or two).

@rtiangha
Copy link
Collaborator

Looks like it worked.

https://github.com/rtiangha/Lime3DS/actions/runs/10188175631/job/28183784346

I'll submit a seperate dependency PR without the OSX change since I noticed that SDL also got an update (better gamepad support, from what I can glean from the commit log) so might as well get that one in too.

@OpenSauce04
Copy link
Member Author

OpenSauce04 commented Aug 1, 2024

oop looks like github picked up on the "Close #xxx" keyword 🙃

@OpenSauce04 OpenSauce04 reopened this Aug 1, 2024
@OpenSauce04
Copy link
Member Author

Successfully tested on my end

@OpenSauce04 OpenSauce04 merged commit 354ebcb into azahar-emu:master Aug 1, 2024
12 checks passed
@OpenSauce04 OpenSauce04 deleted the macos-13-cmake-target branch August 1, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants