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

Changed directX build architecture number

Browse Source
This commit is contained in:
Bei Yang 2009-11-11 18:32:37 +00:00
parent 067fc6219d
commit 89749f91a6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makepanda/makepandacore.py
View File

@ -1203,6 +1203,8 @@ def SdkLocateDirectX():
dir = GetRegistryKey("SOFTWARE\\Microsoft\\DirectX\\Microsoft DirectX SDK (March 2009)", "InstallPath") dir = GetRegistryKey("SOFTWARE\\Microsoft\\DirectX\\Microsoft DirectX SDK (March 2009)", "InstallPath")
if (dir != 0): if (dir != 0):
SDK["DX9"] = dir.replace("\\", "/").rstrip("/") SDK["DX9"] = dir.replace("\\", "/").rstrip("/")
archStr = "x86"
if (platform.architecture()[0] == "64bit"): archStr = "x64"
if ("DX9" not in SDK) or ("DX8" not in SDK): if ("DX9" not in SDK) or ("DX8" not in SDK):
uninstaller = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; uninstaller = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall";
for subdir in ListRegistryKeys(uninstaller): for subdir in ListRegistryKeys(uninstaller):
@ -1219,8 +1221,8 @@ def SdkLocateDirectX():
(os.path.isfile(dir+"\\Include\\d3d9.h")) and (os.path.isfile(dir+"\\Include\\d3d9.h")) and
(os.path.isfile(dir+"\\Include\\d3dx9.h")) and (os.path.isfile(dir+"\\Include\\d3dx9.h")) and
(os.path.isfile(dir+"\\Include\\dxsdkver.h")) and (os.path.isfile(dir+"\\Include\\dxsdkver.h")) and
(os.path.isfile(dir+"\\Lib\\x86\\d3d9.lib")) and (os.path.isfile(dir+"\\Lib\\" + archStr + "\\d3d9.lib")) and
(os.path.isfile(dir+"\\Lib\\x86\\d3dx9.lib"))): (os.path.isfile(dir+"\\Lib\\" + archStr + "\\d3dx9.lib"))):
SDK["DX9"] = dir.replace("\\", "/").rstrip("/") SDK["DX9"] = dir.replace("\\", "/").rstrip("/")
if ("DX9" in SDK): if ("DX9" in SDK):
SDK["DIRECTCAM"] = SDK["DX9"] SDK["DIRECTCAM"] = SDK["DX9"]