aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-11-29 05:13:17 -0700
committerJacek Antonelli2009-12-06 16:32:42 -0600
commit0f0141b8fc755e36d73bbb59286b23aece82c27d (patch)
treea200ff86ab5f45290cca3b20065553e29e87cb9e
parentMake sure windows always uses the Imprudence icon (diff)
downloadmeta-impy-0f0141b8fc755e36d73bbb59286b23aece82c27d.zip
meta-impy-0f0141b8fc755e36d73bbb59286b23aece82c27d.tar.gz
meta-impy-0f0141b8fc755e36d73bbb59286b23aece82c27d.tar.bz2
meta-impy-0f0141b8fc755e36d73bbb59286b23aece82c27d.tar.xz
Removed VS2003 boost references from CMake
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/cmake/Boost.cmake14
2 files changed, 7 insertions, 12 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index e26777d..4acad15 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-11-29 McCabe Maxsted <hakushakukun@gmail.com> 12009-11-29 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Removed VS2003 boost references from CMake.
4
5 modified: linden/indra/cmake/Boost.cmake
6
7
3 * Make sure windows always uses the Imprudence icon. 8 * Make sure windows always uses the Imprudence icon.
4 9
5 new file: linden/indra/newview/res/imp_icon.ico 10 new file: linden/indra/newview/res/imp_icon.ico
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 50b8eff..a84a09f 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -16,17 +16,7 @@ else (STANDALONE)
16 16
17 if (WINDOWS) 17 if (WINDOWS)
18 set(BOOST_VERSION 1_36) 18 set(BOOST_VERSION 1_36)
19 if (MSVC71) 19 if (MSVC80)
20 set(BOOST_PROGRAM_OPTIONS_LIBRARY
21 optimized libboost_program_options-vc71-mt-${BOOST_VERSION}
22 debug libboost_program_options-vc71-mt-gd-${BOOST_VERSION})
23 set(BOOST_REGEX_LIBRARY
24 optimized libboost_regex-vc71-mt-${BOOST_VERSION}
25 debug libboost_regex-vc71-mt-gd-${BOOST_VERSION})
26 set(BOOST_SIGNALS_LIBRARY
27 optimized libboost_signals-vc71-mt-${BOOST_VERSION}
28 debug libboost_signals-vc71-mt-gd-${BOOST_VERSION})
29 elseif (MSVC80)
30 set(BOOST_PROGRAM_OPTIONS_LIBRARY 20 set(BOOST_PROGRAM_OPTIONS_LIBRARY
31 optimized libboost_program_options-vc80-mt-${BOOST_VERSION} 21 optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
32 debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) 22 debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -46,7 +36,7 @@ else (STANDALONE)
46 set(BOOST_SIGNALS_LIBRARY 36 set(BOOST_SIGNALS_LIBRARY
47 optimized libboost_signals-vc90-mt-${BOOST_VERSION} 37 optimized libboost_signals-vc90-mt-${BOOST_VERSION}
48 debug libboost_signals-vc90-mt-gd-${BOOST_VERSION}) 38 debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
49 endif (MSVC71) 39 endif (MSVC80)
50 elseif (DARWIN) 40 elseif (DARWIN)
51 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) 41 set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
52 set(BOOST_REGEX_LIBRARY boost_regex-mt) 42 set(BOOST_REGEX_LIBRARY boost_regex-mt)