TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add code to locate June 2010 DirectX SDK outside of the registry

Browse Source
This commit is contained in:
rdb 2015-11-20 02:05:18 +01:00
parent da6d5f442c
commit 7fa407a118
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
makepanda/makepandacore.py
View File

@ -1704,6 +1704,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):
@ -1738,21 +1750,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")