From 7fa407a1186c4384bd2e3b77f064531e4ddadc2c Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 20 Nov 2015 02:05:18 +0100 Subject: [PATCH] Add code to locate June 2010 DirectX SDK outside of the registry --- makepanda/makepandacore.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 41c0c941eb..fa3746b181 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1704,6 +1704,18 @@ def SdkLocateDirectX( strMode = 'default' ): print("Using DirectX SDK June 2010") SDK["DX9"] = dir.replace("\\", "/").rstrip("/") 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): dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (August 2009)", "InstallPath") if (dir != 0): @@ -1738,21 +1750,32 @@ def SdkLocateDirectX( strMode = 'default' ): SDK["DX9"] = dir.replace("\\", "/").rstrip("/") if ("DX9" not in SDK): return + elif strMode == 'jun2010': if ("DX9" not in SDK): dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (June 2010)", "InstallPath") if (dir != 0): - print("Found DirectX SDK June 2010") SDK["DX9"] = dir.replace("\\", "/").rstrip("/") SDK["GENERIC_DXERR_LIBRARY"] = 1; if ("DX9" not in SDK): dir = GetRegistryKey("SOFTWARE\\Microsoft\\DirectX\\Microsoft DirectX SDK (June 2010)", "InstallPath") if (dir != 0): - print("Found DirectX SDK June 2010") SDK["DX9"] = dir.replace("\\", "/").rstrip("/") 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): exit("Couldn't find DirectX June2010 SDK") + else: + print("Found DirectX SDK June 2010") elif strMode == 'aug2009': if ("DX9" not in SDK): dir = GetRegistryKey("SOFTWARE\\Wow6432Node\\Microsoft\\DirectX\\Microsoft DirectX SDK (August 2009)", "InstallPath")