From a84b98e31e99b361ea08dddee6183902cefbca59 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Thu, 17 Sep 2009 15:51:29 -0400
Subject: [PATCH] Rebuilt windows boost for CRT version DLL hell, upgrading to
1.39 in the process.
---
indra/cmake/Boost.cmake | 2 +-
indra/llmath/llmath.h | 1 +
install.xml | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 0578ae95ffa..efe9ad74d3f 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 f85c4f39f41..7a5d51ff768 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
diff --git a/install.xml b/install.xml
index 1e585b1bd5d..e51835de3a7 100644
--- a/install.xml
+++ b/install.xml
@@ -228,9 +228,9 @@
<key>windows</key>
<map>
<key>md5sum</key>
- <string>76a436d78f34286a7d13faca5f522f6b</string>
+ <string>4f05166629caa4c132a7448eefb8d592</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-windows-20090803.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20090917.tar.bz2</uri>
</map>
</map>
</map>
--
GitLab