TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Assorted stuff. Also, removed the part about Python framework detection on OSX - makepanda now compiles against the version of Python you are running it from.

Browse Source
This commit is contained in:
rdb 2009-10-19 18:43:50 +00:00
parent 10b616d819
commit 4e9896ab9e
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makepanda/makepanda.py
View File

@ -247,6 +247,7 @@ builtdir = os.path.join(os.path.abspath(GetOutputDir()))
AddToPathEnv("PYTHONPATH", builtdir)
AddToPathEnv("PANDA_PRC_DIR", os.path.join(builtdir, "etc"))
if (sys.platform.startswith("win")):
AddToPathEnv("PATH", os.path.join(builtdir, "plugins"))
AddToPathEnv("PYTHONPATH", os.path.join(builtdir, "bin"))
else:
AddToPathEnv("PATH", os.path.join(builtdir, "bin"))
@ -3262,7 +3263,7 @@ if (RUNTIME):
TargetAdd('panda3d.exe', input='libpandaexpress_s.ilb')
TargetAdd('panda3d.exe', input='libp3dtoolconfig_s.ilb')
TargetAdd('panda3d.exe', input='libp3dtool_s.ilb')
TargetAdd('panda3d.exe', opts=['PYTHON', 'TINYXML', 'OPENSSL', 'ZLIB', 'WINGDI', 'WINUSER', 'WINSHELL', 'ADVAPI', 'WINSOCK2'])
TargetAdd('panda3d.exe', opts=['PYTHON', 'TINYXML', 'OPENSSL', 'ZLIB', 'WINGDI', 'WINUSER', 'WINSHELL', 'ADVAPI', 'WINSOCK2', 'WINOLE'])
#
# DIRECTORY: pandatool/src/pandatoolbase/

10
makepanda/makepandacore.py
View File

@ -1222,16 +1222,6 @@ def SdkLocatePython():
pv = pv[7:10]
SDK["PYTHONVERSION"]="python"+pv
elif (sys.platform == "darwin"):
if "MACOSX" not in SDK: SdkLocateMacOSX()
if (os.path.isdir("%s/System/Library/Frameworks/Python.framework" % SDK["MACOSX"])):
pv = os.readlink("%s/System/Library/Frameworks/Python.framework/Versions/Current" % SDK["MACOSX"])
SDK["PYTHON"] = SDK["MACOSX"] + "/System/Library/Frameworks/Python.framework/Headers"
SDK["PYTHONVERSION"] = "python " +pv
SDK["PYTHONEXEC"] = "/System/Library/Frameworks/Python.framework/Versions/Current/bin/python"
else:
exit("Could not find the python framework!")
else:
SDK["PYTHON"] = sysconfig.get_python_inc()
SDK["PYTHONVERSION"] = "python" + sysconfig.get_python_version()