From 429d3306a1a1c5ebf9b35cd3f7bc12427ab6119d Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 20 Jul 2009 17:29:01 +0000 Subject: [PATCH] Final fixes (I hope) to get the runtime fully automatically compiled by makepanda, on Windows too. --- makepanda/makepanda.py | 7 ++++--- makepanda/makepandacore.py | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index b1ab939e50..d7d46c1f32 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -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")) ########################################################################################## # diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index b2d0116e69..9290eab695 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -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 +