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: pip-install interrogate before setting PYTHONHOME

This commit is contained in:
rdb 2024-11-04 15:28:06 +01:00
parent 271cd14544
commit 8fcaea6e90
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makepanda/makepanda.py
View File

@ -560,6 +560,11 @@ if GetHost() == 'windows' and GetTarget() == 'windows':
else:
COMPILER = "GCC"
# Ensure we've pip-installed interrogate if we need it before setting
# PYTHONHOME, etc.
if not PkgSkip("PYTHON"):
GetInterrogate()
SetupBuildEnvironment(COMPILER)
########################################################################

2
makepanda/makepandacore.py
View File

@ -2160,7 +2160,6 @@ def SdkLocatePython(prefer_thirdparty_python=False):
ver = py_dllver[0] + '.' + py_dllver[1:]
SDK["PYTHONVERSION"] = "python" + ver + abiflags
os.environ["PYTHONHOME"] = SDK["PYTHON"]
running_ver = '%d.%d' % sys.version_info[:2]
if ver != running_ver:
@ -3090,6 +3089,7 @@ def SetupBuildEnvironment(compiler):
# extension_native_helpers.py currently expects to find libpandaexpress on sys.path.
AddToPathEnv("PYTHONPATH", os.path.join(builtdir, "bin"))
AddToPathEnv("PATH", os.path.join(builtdir, "plugins"))
os.environ["PYTHONHOME"] = SDK["PYTHON"]
# Now for the special (DY)LD_LIBRARY_PATH on Unix-esque systems.
if GetHost() != 'windows':