From 0f0141b8fc755e36d73bbb59286b23aece82c27d Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 29 Nov 2009 05:13:17 -0700 Subject: Removed VS2003 boost references from CMake --- ChangeLog.txt | 5 +++++ linden/indra/cmake/Boost.cmake | 14 ++------------ 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 @@ 2009-11-29 McCabe Maxsted + * Removed VS2003 boost references from CMake. + + modified: linden/indra/cmake/Boost.cmake + + * Make sure windows always uses the Imprudence icon. 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) if (WINDOWS) set(BOOST_VERSION 1_36) - if (MSVC71) - set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc71-mt-${BOOST_VERSION} - debug libboost_program_options-vc71-mt-gd-${BOOST_VERSION}) - set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc71-mt-${BOOST_VERSION} - debug libboost_regex-vc71-mt-gd-${BOOST_VERSION}) - set(BOOST_SIGNALS_LIBRARY - optimized libboost_signals-vc71-mt-${BOOST_VERSION} - debug libboost_signals-vc71-mt-gd-${BOOST_VERSION}) - elseif (MSVC80) + if (MSVC80) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) @@ -46,7 +36,7 @@ else (STANDALONE) set(BOOST_SIGNALS_LIBRARY optimized libboost_signals-vc90-mt-${BOOST_VERSION} debug libboost_signals-vc90-mt-gd-${BOOST_VERSION}) - endif (MSVC71) + endif (MSVC80) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt) -- cgit v1.1