RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makepanda: Use PythonT.framework when using free-threaded build

This commit is contained in:
rdb 2024-10-29 16:36:49 +01:00
parent 6885edc811
commit 1f6ed882ab
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makepanda/makepandacore.py
View File

@ -2189,11 +2189,15 @@ def SdkLocatePython(prefer_thirdparty_python=False):
sysroot = SDK.get("MACOSX", "")
version = locations.get_python_version()
py_fwx = "{0}/System/Library/Frameworks/Python.framework/Versions/{1}".format(sysroot, version)
framework_name = "Python"
if 't' in abiflags:
framework_name += "T"
py_fwx = "{0}/System/Library/Frameworks/{1}.framework/Versions/{2}".format(sysroot, framework_name, version)
if not os.path.exists(py_fwx):
# Fall back to looking on the system.
py_fwx = "/Library/Frameworks/Python.framework/Versions/" + version
py_fwx = "/Library/Frameworks/{0}.framework/Versions/{1}".format(framework_name, version)
if not os.path.exists(py_fwx):
# Newer macOS versions use this scheme.

3
makepanda/makewheel.py
View File

@ -497,7 +497,8 @@ class WheelFile(object):
self.consider_add_dependency(target_dep, dep_path)
continue
elif dep.startswith('/Library/Frameworks/Python.framework/'):
elif dep.startswith('/Library/Frameworks/Python.framework/') or \
dep.startswith('/Library/Frameworks/PythonT.framework/'):
# Add this dependency if it's in the Python directory.
target_dep = os.path.dirname(target_path) + '/' + os.path.basename(dep)
target_dep = self.consider_add_dependency(target_dep, dep, loader_path)