summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-06-30 17:31:04 -0700
committerbrad kittenbrink <brad@lindenlab.com>2010-06-30 17:31:04 -0700
commit07f94c9a614223a4e44e122ced93ab37f4862adb (patch)
treefaf37b21cf8394160e2a11d663891a4155c62419
parent6ee19aedf393906aec1d19abe0752f9307599165 (diff)
parentfed730b0eef0a528e9d20d946ea397d67cf46fe5 (diff)
Automated merge with ssh://hg.lindenlab.com/brad/viewer-dev
-rw-r--r--indra/cmake/00-Common.cmake4
-rw-r--r--install.xml4
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 592e9fc901..a114d6e778 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -74,6 +74,10 @@ if (WINDOWS)
if (NOT VS_DISABLE_FATAL_WARNINGS)
add_definitions(/WX)
endif (NOT VS_DISABLE_FATAL_WARNINGS)
+
+ # configure win32 API for windows XP+ compatibility
+ set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
+ add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
endif (WINDOWS)
diff --git a/install.xml b/install.xml
index 39806a664d..3795fc3757 100644
--- a/install.xml
+++ b/install.xml
@@ -214,9 +214,9 @@
<key>windows</key>
<map>
<key>md5sum</key>
- <string>94fd43f534e2055858d524086384907d</string>
+ <string>72e6e2eff5d146a107f3059b6c31fb95</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100219.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100630.tar.bz2</uri>
</map>
</map>
</map>