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

Final fixes (I hope) to get the runtime fully automatically compiled by makepanda, on Windows too.

Browse Source
This commit is contained in:
rdb 2009-07-20 17:29:01 +00:00
parent 191c9e7e65
commit 429d3306a1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makepanda/makepanda.py
View File

@ -229,10 +229,11 @@ else:
builtdir = os.path.join(os.path.abspath(GetOutputDir()))
sys.path += [builtdir, os.path.join(builtdir, "lib")]
if ("PYTHONPATH" in os.environ):
os.environ["PYTHONPATH"] = "%s:%s:%s" % (builtdir, os.path.join(builtdir, "lib"), os.environ["PYTHONPATH"])
AddToPathEnv("PYTHONPATH", builtdir)
if (sys.platform.startswith("win")):
AddToPathEnv("PYTHONPATH", os.path.join(builtdir, "bin"))
else:
os.environ["PYTHONPATH"] = builtdir + ":" + os.path.join(builtdir, "lib")
AddToPathEnv("PYTHONPATH", os.path.join(builtdir, "lib"))
##########################################################################################
#

6
makepanda/makepandacore.py
View File

@ -1004,7 +1004,10 @@ def SdkAutoDisableMax():
def AddToPathEnv(path,add):
if (path in os.environ):
os.environ[path] = add + ";" + os.environ[path]
if (sys.platform.startswith("win")):
os.environ[path] = add + ";" + os.environ[path]
else:
os.environ[path] = add + ":" + os.environ[path]
else:
os.environ[path] = add
@ -1319,3 +1322,4 @@ def TargetAdd(target, dummy=0, opts=0, input=0, dep=0, ipath=0):
t.deps[FindLocation("interrogate.exe",[])] = 1
t.deps[FindLocation("dtool_have_python.dat",[])] = 1