diff options
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/build/build_nacl.py | 9 | ||||
| -rw-r--r-- | o3d/svn_paths.scons | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/o3d/build/build_nacl.py b/o3d/build/build_nacl.py index 044e9a3..af4c5cf 100644 --- a/o3d/build/build_nacl.py +++ b/o3d/build/build_nacl.py @@ -92,8 +92,13 @@ def FindPlatformSDK(): _winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A\\WinSDKBuild') except WindowsError: - print 'The Windows SDK version 6.0 or later needs to be installed' - sys.exit(1) + try: + winsdk_key = _winreg.OpenKey( + _winreg.HKEY_LOCAL_MACHINE, + 'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A\\VistaClientHeadersLibs') + except WindowsError: + print 'The Windows SDK version 6.0 or later needs to be installed' + sys.exit(1) try: winsdk_dir, value_type = _winreg.QueryValueEx(winsdk_key, 'InstallationFolder') diff --git a/o3d/svn_paths.scons b/o3d/svn_paths.scons index 4741f6a..318ea72 100644 --- a/o3d/svn_paths.scons +++ b/o3d/svn_paths.scons @@ -102,10 +102,15 @@ if env.Bit('host_windows'): try: winsdk_key = _winreg.OpenKey( _winreg.HKEY_LOCAL_MACHINE, - 'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1\\WinSDKBuild') + 'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A\\VistaClientHeadersLibs') except WindowsError: - print 'The Windows SDK version 6.0 or later needs to be installed' - sys.exit(1) + try: + winsdk_key = _winreg.OpenKey( + _winreg.HKEY_LOCAL_MACHINE, + 'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1\\WinSDKBuild') + except WindowsError: + print 'The Windows SDK version 6.0 or later needs to be installed' + sys.exit(1) try: winsdk_dir, value_type = _winreg.QueryValueEx(winsdk_key, 'InstallationFolder') |