aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/cmake/Boost.cmake7
-rw-r--r--linden/indra/newview/CMakeLists.txt2
-rwxr-xr-xlinden/install.xml4
3 files changed, 10 insertions, 3 deletions
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index a84a09f..90f39d2 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -6,10 +6,11 @@ set(Boost_FIND_REQUIRED ON)
6 6
7if (STANDALONE) 7if (STANDALONE)
8 include(FindBoost) 8 include(FindBoost)
9 9 set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
10 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 10 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
11 set(BOOST_REGEX_LIBRARY boost_regex-mt) 11 set(BOOST_REGEX_LIBRARY boost_regex-mt)
12 set(BOOST_SIGNALS_LIBRARY boost_signals-mt) 12 set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
13 set(BOOST_SYSTEM_LIBRARY boost_filesystem-mt)
13else (STANDALONE) 14else (STANDALONE)
14 use_prebuilt_binary(boost) 15 use_prebuilt_binary(boost)
15 set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) 16 set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
@@ -38,12 +39,16 @@ else (STANDALONE)
38 debug libboost_signals-vc90-mt-gd-${BOOST_VERSION}) 39 debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
39 endif (MSVC80) 40 endif (MSVC80)
40 elseif (DARWIN) 41 elseif (DARWIN)
42 set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
41 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 43 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
42 set(BOOST_REGEX_LIBRARY boost_regex-mt) 44 set(BOOST_REGEX_LIBRARY boost_regex-mt)
43 set(BOOST_SIGNALS_LIBRARY boost_signals-mt) 45 set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
46 set(BOOST_SYSTEM_LIBRARY boost_filesystem-mt)
44 elseif (LINUX) 47 elseif (LINUX)
48 set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
45 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 49 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
46 set(BOOST_REGEX_LIBRARY boost_regex-mt) 50 set(BOOST_REGEX_LIBRARY boost_regex-mt)
47 set(BOOST_SIGNALS_LIBRARY boost_signals-mt) 51 set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
52 set(BOOST_SYSTEM_LIBRARY boost_system-mt)
48 endif (WINDOWS) 53 endif (WINDOWS)
49endif (STANDALONE) 54endif (STANDALONE)
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index c047a0f..cd4acdc 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1346,9 +1346,11 @@ target_link_libraries(${VIEWER_BINARY_NAME}
1346 ${LLCOMMON_LIBRARIES} 1346 ${LLCOMMON_LIBRARIES}
1347 ${NDOF_LIBRARY} 1347 ${NDOF_LIBRARY}
1348 ${viewer_LIBRARIES} 1348 ${viewer_LIBRARIES}
1349 ${BOOST_FILESYSTEM_LIBRARY}
1349 ${BOOST_PROGRAM_OPTIONS_LIBRARY} 1350 ${BOOST_PROGRAM_OPTIONS_LIBRARY}
1350 ${BOOST_REGEX_LIBRARY} 1351 ${BOOST_REGEX_LIBRARY}
1351 ${BOOST_SIGNALS_LIBRARY} 1352 ${BOOST_SIGNALS_LIBRARY}
1353 ${BOOST_SYSTEM_LIBRARY}
1352 ${DBUSGLIB_LIBRARIES} 1354 ${DBUSGLIB_LIBRARIES}
1353 ${OPENGL_LIBRARIES} 1355 ${OPENGL_LIBRARIES}
1354 ${FMODWRAPPER_LIBRARY} 1356 ${FMODWRAPPER_LIBRARY}
diff --git a/linden/install.xml b/linden/install.xml
index ab25938..a7e758e 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -235,9 +235,9 @@
235 <key>linux</key> 235 <key>linux</key>
236 <map> 236 <map>
237 <key>md5sum</key> 237 <key>md5sum</key>
238 <string>15149b8140d06f9bd1b8672b958c6915</string> 238 <string>4db3d74e40d149eeec06f4d97a609bb1</string>
239 <key>url</key> 239 <key>url</key>
240 <uri>http://imprudenceviewer.org/download/libs/boost-1.36.0-linux-20091128.tar.bz2</uri> 240 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100624.tar.bz2</uri>
241 </map> 241 </map>
242 <key>linux64</key> 242 <key>linux64</key>
243 <map> 243 <map>