TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source 
Conflicts:
	dtool/src/interrogate/interfaceMakerPythonNative.cxx
This commit is contained in:
rdb 2015-11-20 02:37:46 +01:00
commit a617376e16
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -1804,7 +1804,7 @@ def CompileRsrc(target, src, opts):
def FreezePy(target, inputs, opts): def FreezePy(target, inputs, opts):
assert len(inputs) > 0 assert len(inputs) > 0
cmdstr = BracketNameWithQuotes(SDK["PYTHONEXEC"]) + " " cmdstr = BracketNameWithQuotes(SDK["PYTHONEXEC"].replace('\\', '/')) + " "
if sys.version_info >= (2, 6): if sys.version_info >= (2, 6):
cmdstr += "-B " cmdstr += "-B "

29
makepanda/makepandacore.py
View File

@ -1705,6 +1705,18 @@ def SdkLocateDirectX( strMode = 'default' ):
print("Using DirectX SDK June 2010") print("Using DirectX SDK June 2010")
SDK["DX9"] = dir.replace("\\", "/").rstrip("/") SDK["DX9"] = dir.replace("\\", "/").rstrip("/")
SDK["GENERIC_DXERR_LIBRARY"] = 1; SDK["GENERIC_DXERR_LIBRARY"] = 1;
if ("DX9" not in SDK):
dir = "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)"
if os.path.isdir(dir):
print("Using DirectX SDK June 2010")
SDK["DX9"] = dir
SDK["GENERIC_DXERR_LIBRARY"] = 1
if ("DX9" not in SDK):
dir = "C:/Program Files/Microsoft DirectX SDK (June 2010)"
if os.path.isdir(dir):
print("Using DirectX SDK June 2010")
SDK["DX9"] = dir
SDK["GENERIC_DXERR_LIBRARY"] = 1
if ("DX9" not in SDK): if ("DX9" not in SDK):
dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (August 2009)", "InstallPath") dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (August 2009)", "InstallPath")
if (dir != 0): if (dir != 0):
@ -1739,21 +1751,32 @@ def SdkLocateDirectX( strMode = 'default' ):
SDK["DX9"] = dir.replace("\\", "/").rstrip("/") SDK["DX9"] = dir.replace("\\", "/").rstrip("/")
if ("DX9" not in SDK): if ("DX9" not in SDK):
return return
elif strMode == 'jun2010': elif strMode == 'jun2010':
if ("DX9" not in SDK): if ("DX9" not in SDK):
dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (June 2010)", "InstallPath") dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (June 2010)", "InstallPath")
if (dir != 0): if (dir != 0):
print("Found DirectX SDK June 2010")
SDK["DX9"] = dir.replace("\\", "/").rstrip("/") SDK["DX9"] = dir.replace("\\", "/").rstrip("/")
SDK["GENERIC_DXERR_LIBRARY"] = 1; SDK["GENERIC_DXERR_LIBRARY"] = 1;
if ("DX9" not in SDK): if ("DX9" not in SDK):
dir = GetRegistryKey("SOFTWARE\\Microsoft\\DirectX\\Microsoft DirectX SDK (June 2010)", "InstallPath") dir = GetRegistryKey("SOFTWARE\\Microsoft\\DirectX\\Microsoft DirectX SDK (June 2010)", "InstallPath")
if (dir != 0): if (dir != 0):
print("Found DirectX SDK June 2010")
SDK["DX9"] = dir.replace("\\", "/").rstrip("/") SDK["DX9"] = dir.replace("\\", "/").rstrip("/")
SDK["GENERIC_DXERR_LIBRARY"] = 1; SDK["GENERIC_DXERR_LIBRARY"] = 1;
if ("DX9" not in SDK):
dir = "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)"
if os.path.isdir(dir):
SDK["DX9"] = dir
SDK["GENERIC_DXERR_LIBRARY"] = 1
if ("DX9" not in SDK):
dir = "C:/Program Files/Microsoft DirectX SDK (June 2010)"
if os.path.isdir(dir):
SDK["DX9"] = dir
SDK["GENERIC_DXERR_LIBRARY"] = 1
if ("DX9" not in SDK): if ("DX9" not in SDK):
exit("Couldn't find DirectX June2010 SDK") exit("Couldn't find DirectX June2010 SDK")
else:
print("Found DirectX SDK June 2010")
elif strMode == 'aug2009': elif strMode == 'aug2009':
if ("DX9" not in SDK): if ("DX9" not in SDK):
dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (August 2009)", "InstallPath") dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (August 2009)", "InstallPath")
@ -2487,7 +2510,7 @@ def SetupBuildEnvironment(compiler):
return return
# Add our output directories to the environment. # Add our output directories to the environment.
builtdir = os.path.join(os.path.abspath(GetOutputDir())) builtdir = GetOutputDir()
AddToPathEnv("PYTHONPATH", builtdir) AddToPathEnv("PYTHONPATH", builtdir)
AddToPathEnv("PANDA_PRC_DIR", os.path.join(builtdir, "etc")) AddToPathEnv("PANDA_PRC_DIR", os.path.join(builtdir, "etc"))
AddToPathEnv("PATH", os.path.join(builtdir, "bin")) AddToPathEnv("PATH", os.path.join(builtdir, "bin"))