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

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"))
 
 ##########################################################################################
 #

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
 
+