From 60f831151e41ccec184c4c6ecace86491fca36da Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Thu, 20 Jan 2011 11:03:53 -0800
Subject: [PATCH] Compile flag for wchar_t, boost 1_45 lib update, indra.l
include ordering adjustment
---
indra/cmake/00-Common.cmake | 4 +--
indra/cmake/Boost.cmake | 36 +++++++++++++--------------
indra/lscript/lscript_compile/indra.l | 5 +++-
install.xml | 4 +--
4 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index dbe0cf5cd05..25a1b05d8ec 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -61,7 +61,7 @@ if (WINDOWS)
/Oy-
)
- if(MSVC80 OR MSVC90)
+ if(MSVC)
set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
CACHE STRING "C++ compiler release options" FORCE)
@@ -69,7 +69,7 @@ if (WINDOWS)
add_definitions(
/Zc:wchar_t-
)
- endif (MSVC80 OR MSVC90)
+ endif (MSVC)
# Are we using the crummy Visual Studio KDU build workaround?
if (NOT VS_DISABLE_FATAL_WARNINGS)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 012d3c2ab20..0b7eb7e99bb 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -17,24 +17,8 @@ else (STANDALONE)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (WINDOWS)
- set(BOOST_VERSION 1_39)
- if (MSVC71)
- set(BOOST_PROGRAM_OPTIONS_LIBRARY
- optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION}
- debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION})
- set(BOOST_REGEX_LIBRARY
- optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
- debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
- set(BOOST_SIGNALS_LIBRARY
- optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
- debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
- set(BOOST_SYSTEM_LIBRARY
- optimized libboost_system-vc71-mt-s-${BOOST_VERSION}
- debug libboost_system-vc71-mt-sgd-${BOOST_VERSION})
- set(BOOST_FILESYSTEM_LIBRARY
- optimized libboost_filesystem-vc71-mt-s-${BOOST_VERSION}
- debug libboost_filesystem-vc71-mt-sgd-${BOOST_VERSION})
- else (MSVC71)
+ set(BOOST_VERSION 1_45)
+ if(MSVC80)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -50,7 +34,21 @@ else (STANDALONE)
set(BOOST_FILESYSTEM_LIBRARY
optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
- endif (MSVC71)
+ else(MSVC80)
+ # MSVC 10.0 config
+ set(BOOST_PROGRAM_OPTIONS_LIBRARY
+ optimized libboost_program_options-vc100-mt
+ debug libboost_program_options-vc100-mt-gd)
+ set(BOOST_REGEX_LIBRARY
+ optimized libboost_regex-vc100-mt
+ debug libboost_regex-vc100-mt-gd)
+ set(BOOST_SYSTEM_LIBRARY
+ optimized libboost_system-vc100-mt
+ debug libboost_system-vc100-mt-gd)
+ set(BOOST_FILESYSTEM_LIBRARY
+ optimized libboost_filesystem-vc100-mt
+ debug libboost_filesystem-vc100-mt-gd)
+ endif (MSVC80)
elseif (DARWIN)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt)
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 8fe9f5ed29c..188c9e1950a 100644
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -8,8 +8,11 @@ FS (f|F)
%n 4000
%p 5000
+%top {
+ #include "linden_common.h"
+}
+
%{
-#include "linden_common.h"
// Deal with the fact that lex/yacc generates unreachable code
#ifdef LL_WINDOWS
#pragma warning (disable : 4018) // warning C4018: signed/unsigned mismatch
diff --git a/install.xml b/install.xml
index 13abaac1c1c..c8342ef31e0 100644
--- a/install.xml
+++ b/install.xml
@@ -214,9 +214,9 @@
<key>windows</key>
<map>
<key>md5sum</key>
- <string>72e6e2eff5d146a107f3059b6c31fb95</string>
+ <string>40b204f6769ee383db35a0585ca035a6</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100630.tar.bz2</uri>
+ <uri>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/palange_3p-test-lib/rev/219285/arch/CYGWIN/installer/boost-1.45.0-windows-20110119.tar.bz2</uri>
</map>
</map>
</map>
--
GitLab