TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bison/flex location, and fix debug Python on Windows with makepanda

Browse Source
This commit is contained in:
rdb 2014-08-21 13:00:36 +00:00
parent bb7a6a3ec4
commit 0eaebaf258
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makepanda/makepandacore.py
View File

@ -430,6 +430,8 @@ def GetBison():
# We don't strictly need it, so don't give an error # We don't strictly need it, so don't give an error
return None return None
return BISON
FLEX = None FLEX = None
def GetFlex(): def GetFlex():
global FLEX global FLEX
@ -445,6 +447,8 @@ def GetFlex():
# We don't strictly need it, so don't give an error # We don't strictly need it, so don't give an error
return None return None
return FLEX
######################################################################## ########################################################################
## ##
## LocateBinary ## LocateBinary
@ -1842,13 +1846,18 @@ def SdkLocatePython(force_use_sys_executable = False):
exit("Could not find %s!" % SDK["PYTHONEXEC"]) exit("Could not find %s!" % SDK["PYTHONEXEC"])
# Determine which version it is by checking which dll is in the directory. # Determine which version it is by checking which dll is in the directory.
if (GetOptimize() <= 2):
py_dlls = glob.glob(SDK["PYTHON"] + "/python[0-9][0-9]_d.dll")
else:
py_dlls = glob.glob(SDK["PYTHON"] + "/python[0-9][0-9].dll") py_dlls = glob.glob(SDK["PYTHON"] + "/python[0-9][0-9].dll")
if len(py_dlls) == 0: if len(py_dlls) == 0:
exit("Could not find the Python dll in %s." % (SDK["PYTHON"])) exit("Could not find the Python dll in %s." % (SDK["PYTHON"]))
elif len(py_dlls) > 1: elif len(py_dlls) > 1:
exit("Found multiple Python dlls in %s." % (SDK["PYTHON"])) exit("Found multiple Python dlls in %s." % (SDK["PYTHON"]))
SDK["PYTHONVERSION"] = "python" + py_dlls[0][-6] + "." + py_dlls[0][-5] py_dll = os.path.basename(py_dlls[0])
SDK["PYTHONVERSION"] = "python" + py_dll[6] + "." + py_dll[7]
elif (GetTarget() == 'windows'): elif (GetTarget() == 'windows'):
SDK["PYTHON"] = os.path.dirname(sysconfig.get_python_inc()) SDK["PYTHON"] = os.path.dirname(sysconfig.get_python_inc())
@ -2581,7 +2590,7 @@ def CalcLocation(fn, ipath):
if (fn.endswith(".res")): return OUTPUTDIR+"/tmp/"+fn if (fn.endswith(".res")): return OUTPUTDIR+"/tmp/"+fn
if (fn.endswith(".tlb")): return OUTPUTDIR+"/tmp/"+fn if (fn.endswith(".tlb")): return OUTPUTDIR+"/tmp/"+fn
if (fn.endswith(".dll")): return OUTPUTDIR+"/bin/"+fn[:-4]+dllext+".dll" if (fn.endswith(".dll")): return OUTPUTDIR+"/bin/"+fn[:-4]+dllext+".dll"
if (fn.endswith(".pyd")): return OUTPUTDIR+"/panda3d/"+fn[:-4]+dllext+".pyd" if (fn.endswith(".pyd")): return OUTPUTDIR+"/panda3d/"+fn[:-4]+".pyd"
if (fn.endswith(".ocx")): return OUTPUTDIR+"/plugins/"+fn[:-4]+dllext+".ocx" if (fn.endswith(".ocx")): return OUTPUTDIR+"/plugins/"+fn[:-4]+dllext+".ocx"
if (fn.endswith(".mll")): return OUTPUTDIR+"/plugins/"+fn[:-4]+dllext+".mll" if (fn.endswith(".mll")): return OUTPUTDIR+"/plugins/"+fn[:-4]+dllext+".mll"
if (fn.endswith(".dlo")): return OUTPUTDIR+"/plugins/"+fn[:-4]+dllext+".dlo" if (fn.endswith(".dlo")): return OUTPUTDIR+"/plugins/"+fn[:-4]+dllext+".dlo"