diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/DirectX.cmake | 2 | ||||
| -rwxr-xr-x | indra/develop.py | 36 | ||||
| -rw-r--r-- | indra/llcommon/llversionserver.h | 4 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
4 files changed, 28 insertions, 16 deletions
diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index d406f3785b..29724ee2fc 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -3,6 +3,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_INCLUDE_DIR dxdiag.h "$ENV{DXSDK_DIR}/Include" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include" @@ -23,6 +24,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_LIBRARY_DIR dxguid.lib "$ENV{DXSDK_DIR}/Lib/x86" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86" diff --git a/indra/develop.py b/indra/develop.py index 90b665e8b1..f670c66639 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -538,27 +538,35 @@ class WindowsSetup(PlatformSetup): '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '%(opts)s "%(dir)s"' % args) + def get_HKLM_registry_value(self, key_str, value_str): + import _winreg + reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE) + key = _winreg.OpenKey(reg, key_str) + value = _winreg.QueryValueEx(key, value_str)[0] + print 'Found: %s' % value + return value + def find_visual_studio(self, gen=None): if gen is None: gen = self._generator gen = gen.lower() + value_str = (r'EnvironmentDirectory') + key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' % + self.gens[gen]['ver']) + print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' % + (key_str, value_str)) try: - import _winreg - key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' % - self.gens[gen]['ver']) - value_str = (r'EnvironmentDirectory') - print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' % - (key_str, value_str)) - print key_str - - reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE) - key = _winreg.OpenKey(reg, key_str) - value = _winreg.QueryValueEx(key, value_str)[0] - print 'Found: %s' % value - return value + return self.get_HKLM_registry_value(key_str, value_str) except WindowsError, err: + key_str = (r'SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%s\Setup\VS' % + self.gens[gen]['ver']) + + try: + return self.get_HKLM_registry_value(key_str, value_str) + except: print >> sys.stderr, "Didn't find ", self.gens[gen]['gen'] - return '' + + return '' def get_build_cmd(self): if self.incredibuild: diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index c840688a7c..c0fc06ee6e 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -34,9 +34,9 @@ #define LL_LLVERSIONSERVER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 27; +const S32 LL_VERSION_MINOR = 29; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 118914; +const S32 LL_VERSION_BUILD = 120909; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 668b710c22..7b1c3003f0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1027,6 +1027,8 @@ if (WINDOWS) if (INTEL_MEMOPS_LIBRARY) list(APPEND viewer_LIBRARIES ${INTEL_MEMOPS_LIBRARY}) endif (INTEL_MEMOPS_LIBRARY) + + use_prebuilt_binary(dbghelp) endif (WINDOWS) # Add the xui files. This is handy for searching for xui elements |