diff options
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/cmake/Boost.cmake | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/autobuild.xml b/autobuild.xml index 340f774a9e..30e78729dd 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -210,9 +210,9 @@ <key>archive</key> <map> <key>hash</key> - <string>de5559c2c497544b3d0da533390175dc</string> + <string>98be22c8833aa2bca184b9fa09fbb82b</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20101001a.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/219456/arch/CYGWIN/installer/boost-1.45.0-windows-20110124.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -1880,7 +1880,7 @@ <key>windows</key> <map> <key>build_directory</key> - <string>build-vc80</string> + <string>build-vc100</string> <key>configurations</key> <map> <key>Debug</key> @@ -1908,7 +1908,7 @@ <key>options</key> <array> <string>-G</string> - <string>"Visual Studio 8 2005"</string> + <string>"Visual Studio 10"</string> </array> </map> <key>name</key> @@ -1939,7 +1939,7 @@ <key>options</key> <array> <string>-G</string> - <string>"Visual Studio 8 2005"</string> + <string>"Visual Studio 10"</string> </array> </map> <key>default</key> @@ -1972,7 +1972,7 @@ <key>options</key> <array> <string>-G</string> - <string>"Visual Studio 8 2005"</string> + <string>"Visual Studio 10"</string> </array> </map> <key>name</key> diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 0b7eb7e99b..b9c047a764 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -37,17 +37,17 @@ else (STANDALONE) else(MSVC80) # MSVC 10.0 config set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc100-mt - debug libboost_program_options-vc100-mt-gd) + optimized libboost_program_options-vc100-mt-${BOOST_VERSION} + debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc100-mt - debug libboost_regex-vc100-mt-gd) + optimized libboost_regex-vc100-mt-${BOOST_VERSION} + debug libboost_regex-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_SYSTEM_LIBRARY - optimized libboost_system-vc100-mt - debug libboost_system-vc100-mt-gd) + optimized libboost_system-vc100-mt-${BOOST_VERSION} + debug libboost_system-vc100-mt-gd-${BOOST_VERSION}) set(BOOST_FILESYSTEM_LIBRARY - optimized libboost_filesystem-vc100-mt - debug libboost_filesystem-vc100-mt-gd) + optimized libboost_filesystem-vc100-mt-${BOOST_VERSION} + debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION}) endif (MSVC80) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) |