From f5e7b0a43902bfaabc6718da1a36f895fa191ad7 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 19 Dec 2020 00:01:36 +0100 Subject: [PATCH] makepanda: prefer more recent macOS SDKs over older ones See Apple's recommendations: https://developer.apple.com/library/archive/qa/qa1806/_index.html We may still be limited to the 10.13 SDK to be able to build FMOD Ex. --- makepanda/makepandacore.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index ffc55853c1..74367cfcee 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -2352,12 +2352,11 @@ def SdkLocateMacOSX(archs = []): xcode_dir = handle.read().strip().rstrip('/') handle.close() - # Make a list of SDK versions that will work for us. - sdk_versions = [] + # Make a list of SDK versions that will work for us, then grab the latest. + sdk_versions = ["11.1", "11.0"] if 'arm64' not in archs: - sdk_versions += ["10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15"] - - sdk_versions += ["11.0", "11.1"] + # Prefer pre-10.14 for now so that we can keep building FMOD. + sdk_versions += ["10.13", "10.12", "10.11", "10.10", "10.9", "10.15", "10.14"] for version in sdk_versions: sdkname = "MacOSX" + version