From 7c2224ba8e879586dbee9c9569d740e3b1539e4c Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 17 Dec 2009 19:11:21 +0000 Subject: [PATCH] oops --- makepanda/makepanda.py | 2 +- makepanda/makepandacore.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 776c289065..b2a6baf72f 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -254,7 +254,7 @@ SdkLocateDirectX() SdkLocateMaya() SdkLocateMax() SdkLocateMacOSX(OSXTARGET) -SdkLocatePython() +SdkLocatePython(RTDIST) SdkLocateVisualStudio() SdkLocateMSPlatform() diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 8eb7624b20..4bebf01ce8 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1299,9 +1299,9 @@ def SdkLocateMax(): if (os.path.isdir(top + "\\" + subdir)!=0): 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" if (GetOptimize() <= 2): SDK["PYTHON"] += "-dbg"