Updated windows version of boost to the 1.39 version used in Snowglobe 1.5. Note: only VS2005 libs currently included

2 files changed, 3 insertions, 26 deletions

diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 7741615..665a162 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -14,7 +14,7 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_36)
+    set(BOOST_VERSION 1_39)
     if (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
@@ -25,6 +25,8 @@ else (STANDALONE)
       set(BOOST_SIGNALS_LIBRARY 
           optimized libboost_signals-vc80-mt-${BOOST_VERSION}
           debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
+        # Default support for VS2008 was lost in the move from 1.36 to 1.39.  
+        # Remove this comment when this is fixed -- MC
     elseif (MSVC90)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc90-mt-${BOOST_VERSION}
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index 0d5b884..1f042bd 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -78,31 +78,6 @@ extern "C" {
 #endif
 #endif
 
-// Force Imprudence to link against the correct boost libraries -- McCabe
-#if defined(_MSC_VER)
-#if _MSC_VER >= 1500
-#ifdef LL_DEBUG
-#pragma comment( lib, "libboost_signals-vc90-mt-gd-1_36.lib" )
-#pragma comment( lib, "libboost_regex-vc90-mt-gd-1_36.lib" )
-#pragma comment( lib, "libboost_program_options-vc90-mt-gd-1_36.lib" )
-#else
-#pragma comment( lib, "libboost_signals-vc90-mt-1_36.lib" )
-#pragma comment( lib, "libboost_regex-vc90-mt-1_36.lib" )
-#pragma comment( lib, "libboost_program_options-vc90-mt-1_36.lib" )
-#endif
-#elif _MSC_VER >= 1400
-#ifdef LL_DEBUG
-#pragma comment( lib, "libboost_signals-vc80-mt-gd-1_36.lib" )
-#pragma comment( lib, "libboost_regex-vc80-mt-gd-1_36.lib" )
-#pragma comment( lib, "libboost_program_options-vc80-mt-gd-1_36.lib" )
-#else
-#pragma comment( lib, "libboost_signals-vc80-mt-1_36.lib" )
-#pragma comment( lib, "libboost_regex-vc80-mt-1_36.lib" )
-#pragma comment( lib, "libboost_program_options-vc80-mt-1_36.lib" )
-#endif
-#endif
-#endif
-
 const std::string LLAppViewerWin32::sWindowClass = "Imprudence";
 
 LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop)