rdb 16 年之前
父節點
當前提交
7c2224ba8e
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      makepanda/makepanda.py
  2. 3 3
      makepanda/makepandacore.py

+ 1 - 1
makepanda/makepanda.py

@@ -254,7 +254,7 @@ SdkLocateDirectX()
 SdkLocateMaya()
 SdkLocateMaya()
 SdkLocateMax()
 SdkLocateMax()
 SdkLocateMacOSX(OSXTARGET)
 SdkLocateMacOSX(OSXTARGET)
-SdkLocatePython()
+SdkLocatePython(RTDIST)
 SdkLocateVisualStudio()
 SdkLocateVisualStudio()
 SdkLocateMSPlatform()
 SdkLocateMSPlatform()
 
 

+ 3 - 3
makepanda/makepandacore.py

@@ -1299,9 +1299,9 @@ def SdkLocateMax():
                         if (os.path.isdir(top + "\\" + subdir)!=0):
                         if (os.path.isdir(top + "\\" + subdir)!=0):
                             SDK[version+"CS"] = top + subdir
                             SDK[version+"CS"] = top + subdir
 
 
-def SdkLocatePython():
-    if (PkgSkip("PYTHON")==0):
-        if (sys.platform == "win32" and not RTDIST):
+def SdkLocatePython(force_use_sys_executable = False):
+    if (PkgSkip("PYTHON")==0 and not force_use_sys_executable):
+        if (sys.platform == "win32"):
             SDK["PYTHON"] = "thirdparty/win-python"
             SDK["PYTHON"] = "thirdparty/win-python"
             if (GetOptimize() <= 2):
             if (GetOptimize() <= 2):
                 SDK["PYTHON"] += "-dbg"
                 SDK["PYTHON"] += "-dbg"