diff options
author | Patrick Sapinski | 2011-02-26 03:07:54 -0500 |
---|---|---|
committer | McCabe Maxsted | 2011-02-27 17:36:37 -0700 |
commit | aeb9fda4f3de93269dca87d7fbf4935a3a8d819e (patch) | |
tree | 61f5d4a51cf9873906dc880059f435127e528023 | |
parent | Removed RELEASE_NOTES.txt since we don't use it in the Experimentals (diff) | |
download | meta-impy-aeb9fda4f3de93269dca87d7fbf4935a3a8d819e.zip meta-impy-aeb9fda4f3de93269dca87d7fbf4935a3a8d819e.tar.gz meta-impy-aeb9fda4f3de93269dca87d7fbf4935a3a8d819e.tar.bz2 meta-impy-aeb9fda4f3de93269dca87d7fbf4935a3a8d819e.tar.xz |
Switched to Phoenix Viewers Boost 1.43 libs for Windows
-rw-r--r-- | linden/indra/cmake/Boost.cmake | 4 | ||||
-rwxr-xr-x | linden/install.xml | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake index 665a162..75ac62e 100644 --- a/linden/indra/cmake/Boost.cmake +++ b/linden/indra/cmake/Boost.cmake | |||
@@ -14,7 +14,7 @@ else (STANDALONE) | |||
14 | set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) | 14 | set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) |
15 | 15 | ||
16 | if (WINDOWS) | 16 | if (WINDOWS) |
17 | set(BOOST_VERSION 1_39) | 17 | set(BOOST_VERSION 1_43) |
18 | if (MSVC80) | 18 | if (MSVC80) |
19 | set(BOOST_PROGRAM_OPTIONS_LIBRARY | 19 | set(BOOST_PROGRAM_OPTIONS_LIBRARY |
20 | optimized libboost_program_options-vc80-mt-${BOOST_VERSION} | 20 | optimized libboost_program_options-vc80-mt-${BOOST_VERSION} |
@@ -25,8 +25,6 @@ else (STANDALONE) | |||
25 | set(BOOST_SIGNALS_LIBRARY | 25 | set(BOOST_SIGNALS_LIBRARY |
26 | optimized libboost_signals-vc80-mt-${BOOST_VERSION} | 26 | optimized libboost_signals-vc80-mt-${BOOST_VERSION} |
27 | debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) | 27 | debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) |
28 | # Default support for VS2008 was lost in the move from 1.36 to 1.39. | ||
29 | # Remove this comment when this is fixed -- MC | ||
30 | elseif (MSVC90) | 28 | elseif (MSVC90) |
31 | set(BOOST_PROGRAM_OPTIONS_LIBRARY | 29 | set(BOOST_PROGRAM_OPTIONS_LIBRARY |
32 | optimized libboost_program_options-vc90-mt-${BOOST_VERSION} | 30 | optimized libboost_program_options-vc90-mt-${BOOST_VERSION} |
diff --git a/linden/install.xml b/linden/install.xml index 846c489..b600e87 100755 --- a/linden/install.xml +++ b/linden/install.xml | |||
@@ -228,9 +228,9 @@ | |||
228 | <key>windows</key> | 228 | <key>windows</key> |
229 | <map> | 229 | <map> |
230 | <key>md5sum</key> | 230 | <key>md5sum</key> |
231 | <string>ed53511382d0fd9fec59a9f6544d9672</string> | 231 | <string>3d4bd78f30f118c6e35f8d367ec25fc2</string> |
232 | <key>url</key> | 232 | <key>url</key> |
233 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20091029.tar.bz2</uri> | 233 | <uri>http://downloads.phoenixviewer.com/boost-1.43.0-windows-20100902.tar.bz2</uri> |
234 | </map> | 234 | </map> |
235 | </map> | 235 | </map> |
236 | </map> | 236 | </map> |