Fix macOS 26 build: SDK detection + zlib update#5
Merged
Raltyro merged 2 commits intoCodenameCrew:oldfrom Mar 2, 2026
Merged
Conversation
My SDKs directory contains three entries: MacOSX.sdk MacOSX26.0.sdk MacOSX26.sdk The current SDK version detection in hxcpp is preferring MacOSX26.sdk over MacOSX26.0.sdk. This is causing MACOSX_VER to be set to 26. However, xcodebuild seems to want both major and minor parts of the version to be specified, so MACOSX_VER should be set to 26.0 instead. This change checks if the current best's minor version is parsed as NaN when the major versions match, which results in a real float value for the minor version to be preferred.
- This commit fixes macOS 15.4 SDK compile problem
|
Very nice! |
Member
|
Again thanks for your contribution, i may not have a mac computer to test this myself but as long you say you do and it works, then i'll be merging it, Although i recommend also opening up a pr to do this to FunkinCrew's hxcpp since it has been recently rebased with FunkinCrew's https://github.com/FunkinCrew/hxcpp |
Member
|
Well apparently one of the folk told me they already have these commits in FunkinCrew', so weird |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picks two fixes from
masterinto theoldbranch, which are needed to build with the macOS 26 (Tahoe) SDK:ceb69140: Fixes issue in which SDK detection picksmacosx26overmacosx26.2becausesplit_best[1]is null for single-component versions, making the>comparison always false.xcrun --sdk macosx26then fails.9004211e: zlib 1.2.13zutil.hredefinesfdopentoNULL, which conflicts with the macOS 26.2 SDK headers. Upgrading to 1.3.1 fixes this.Tested locally, project builds cleanly after both cherry-picks.