diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-22 17:10:47 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-22 17:10:47 +0000 |
| commit | 04712617c55c53dbec1f73a4e8834ebe3167e5ed (patch) | |
| tree | e14e202280a13045a95693144c0dbbf98197d7b5 /indra/cmake | |
| parent | 96ddf30a49a4ebca25816701373c34674088b2ce (diff) | |
| parent | fa9811e0c5dbd249a9c6e37d95d2d842d43658a2 (diff) | |
merge of viewer2 trunk and 'EXT-5601: Linux: volume adjustment of web-based media / Flash'
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 3652508b6a..7ce57a5572 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -38,9 +38,9 @@ else (STANDALONE) debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) endif (MSVC71) elseif (DARWIN) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) - set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-mt) + set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) + set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt) + set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt) elseif (LINUX) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt) set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt) |