diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-09-17 20:03:56 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-09-17 20:03:56 -0400 |
| commit | a56efcd7e48a797df26e03755c4cb86076fa24c0 (patch) | |
| tree | 9ec3fb3d7d78650173b39d7515f3b120e4df5e09 /indra | |
| parent | 422b9c5872f15b3d0a6e40472a8e528d7d94df5f (diff) | |
| parent | 4489a018ca28b5f588b90d3b567123c11d9baaee (diff) | |
Merged in my CRT dll hell library changes.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Boost.cmake | 2 | ||||
| -rw-r--r-- | indra/llmath/llmath.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 0578ae95ff..efe9ad74d3 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -15,7 +15,7 @@ else (STANDALONE) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (WINDOWS) - set(BOOST_VERSION 1_34_1) + set(BOOST_VERSION 1_39) if (MSVC71) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION} diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index f85c4f39f4..7a5d51ff76 100644 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -35,6 +35,7 @@ #include <cmath> #include <cstdlib> +#include <complex> #include "lldefs.h" //#include "llstl.h" // *TODO: Remove when LLString is gone //#include "llstring.h" // *TODO: Remove when LLString is gone |