TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Fix detection issues with newer macOS/XCode versions

Browse Source
This commit is contained in:
rdb 2022-12-06 17:30:26 +01:00
parent 619050bb32
commit 27d3aed2d3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makepanda/makepandacore.py
View File

@ -2258,6 +2258,10 @@ def SdkLocatePython(prefer_thirdparty_python=False):
# Fall back to looking on the system.
py_fwx = "/Library/Frameworks/Python.framework/Versions/" + version
if not os.path.exists(py_fwx):
# Newer macOS versions use this scheme.
py_fwx = "/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/" + version
if not os.path.exists(py_fwx):
exit("Could not locate Python installation at %s" % (py_fwx))
@ -2503,6 +2507,10 @@ def SdkLocateMacOSX(osxtarget = None, archs = []):
SDK["MACOSX"] = "/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk"
elif sdkname == "MacOSX11.0" and os.path.exists("/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk"):
SDK["MACOSX"] = "/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk"
elif sdkname == "MacOSX11.0" and os.path.exists("/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk"):
SDK["MACOSX"] = "/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk"
elif sdkname == "MacOSX11.0" and os.path.exists("/Library/Developer/CommandLineTools/SDKs/MacOSX13.0.sdk"):
SDK["MACOSX"] = "/Library/Developer/CommandLineTools/SDKs/MacOSX13.0.sdk"
else:
exit("Couldn't find any MacOSX SDK for macOS version %s!" % sdkname)
SDK["OSXTARGET"] = osxtarget