From 1c1bee24d7aefdda1d4dcf66f80c1dabe7e72152 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Thu, 13 Jan 2011 14:28:03 -0800
Subject: Added vc10, removed vc90 and vc71 from supported vc versions
---
indra/develop.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/indra/develop.py b/indra/develop.py
index 36c947327a..c88c8a9d06 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -477,11 +477,16 @@ class WindowsSetup(PlatformSetup):
'vc90' : {
'gen' : r'Visual Studio 9 2008',
'ver' : r'9.0'
+ },
+ 'vc10' : {
+ 'gen' : r'Visual Studio 10',
+ 'ver' : r'10.0'
}
}
gens['vs2003'] = gens['vc71']
gens['vs2005'] = gens['vc80']
gens['vs2008'] = gens['vc90']
+ gens['vs2010'] = gens['vc10']
search_path = r'C:\windows'
exe_suffixes = ('.exe', '.bat', '.com')
@@ -493,7 +498,7 @@ class WindowsSetup(PlatformSetup):
def _get_generator(self):
if self._generator is None:
- for version in 'vc80 vc90 vc71'.split():
+ for version in 'vc10 vc80'.split():
if self.find_visual_studio(version):
self._generator = version
print 'Building with ', self.gens[version]['gen']
--
cgit v1.2.3
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: 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 dbe0cf5cd0..25a1b05d8e 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 012d3c2ab2..0b7eb7e99b 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 8fe9f5ed29..188c9e1950 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 13abaac1c1..c8342ef31e 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>
--
cgit v1.2.3
From 9775b80fefe79b7f424677aaf0f70e8b4142b15f Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Fri, 21 Jan 2011 14:25:33 -0800
Subject: Code fixes for VS2010 compatibility
---
indra/newview/llgroupmgr.cpp | 1 +
indra/newview/lllogchat.cpp | 1 +
indra/newview/llpaneloutfitedit.cpp | 6 +++---
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 7546c070ea..ce936a9924 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -52,6 +52,7 @@
#include <boost/regex.hpp>
#if LL_MSVC
+#pragma warning(push)
// disable boost::lexical_cast warning
#pragma warning (disable:4702)
#endif
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index b09cfbe907..efc4e23838 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -42,6 +42,7 @@
#include <boost/regex/v4/match_results.hpp>
#if LL_MSVC
+#pragma warning(push)
// disable warning about boost::lexical_cast unreachable code
// when it fails to parse the string
#pragma warning (disable:4702)
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index c10c21683b..9346e48d1e 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -1323,19 +1323,19 @@ void LLPanelOutfitEdit::getCurrentItemUUID(LLUUID& selected_id)
void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list)
{
+ void (uuid_vec_t::* tmp)(LLUUID const &) = &uuid_vec_t::push_back;
if (mInventoryItemsPanel->getVisible())
{
std::set<LLUUID> item_set = mInventoryItemsPanel->getRootFolder()->getSelectionList();
- std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, _1));
+ std::for_each(item_set.begin(), item_set.end(), boost::bind( tmp, &uuid_list, _1));
}
else if (mWearablesListViewPanel->getVisible())
{
std::vector<LLSD> item_set;
mWearableItemsList->getSelectedValues(item_set);
- std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, boost::bind(&LLSD::asUUID, _1 )));
-
+ std::for_each(item_set.begin(), item_set.end(), boost::bind( tmp, &uuid_list, boost::bind(&LLSD::asUUID, _1 )));
}
// return selected_id;
--
cgit v1.2.3
From 45e25e83cf7457f495b051b9f7683ee299547290 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Fri, 21 Jan 2011 15:30:01 -0800
Subject: Disabled media_plugin_webkit dependency, temporarily
---
indra/newview/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5d2342e925..a842e0db76 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1547,7 +1547,7 @@ if (WINDOWS)
${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qtwcodecsd4.dll
SLPlugin
media_plugin_quicktime
- media_plugin_webkit
+ #media_plugin_webkit
winmm_shim
windows-crash-logger
windows-updater
--
cgit v1.2.3
From 6dd086794f5cf319fca1736a5803423b58d79d0b Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Mon, 24 Jan 2011 12:04:49 -0800
Subject: Updated boost lib
---
autobuild.xml | 12 ++++++------
indra/cmake/Boost.cmake | 16 ++++++++--------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 340f774a9e..30e78729dd 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -210,9 +210,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>de5559c2c497544b3d0da533390175dc</string>
+ <string>98be22c8833aa2bca184b9fa09fbb82b</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20101001a.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/219456/arch/CYGWIN/installer/boost-1.45.0-windows-20110124.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1880,7 +1880,7 @@
<key>windows</key>
<map>
<key>build_directory</key>
- <string>build-vc80</string>
+ <string>build-vc100</string>
<key>configurations</key>
<map>
<key>Debug</key>
@@ -1908,7 +1908,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 8 2005"</string>
+ <string>"Visual Studio 10"</string>
</array>
</map>
<key>name</key>
@@ -1939,7 +1939,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 8 2005"</string>
+ <string>"Visual Studio 10"</string>
</array>
</map>
<key>default</key>
@@ -1972,7 +1972,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>"Visual Studio 8 2005"</string>
+ <string>"Visual Studio 10"</string>
</array>
</map>
<key>name</key>
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 0b7eb7e99b..b9c047a764 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -37,17 +37,17 @@ else (STANDALONE)
else(MSVC80)
# MSVC 10.0 config
set(BOOST_PROGRAM_OPTIONS_LIBRARY
- optimized libboost_program_options-vc100-mt
- debug libboost_program_options-vc100-mt-gd)
+ optimized libboost_program_options-vc100-mt-${BOOST_VERSION}
+ debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION})
set(BOOST_REGEX_LIBRARY
- optimized libboost_regex-vc100-mt
- debug libboost_regex-vc100-mt-gd)
+ optimized libboost_regex-vc100-mt-${BOOST_VERSION}
+ debug libboost_regex-vc100-mt-gd-${BOOST_VERSION})
set(BOOST_SYSTEM_LIBRARY
- optimized libboost_system-vc100-mt
- debug libboost_system-vc100-mt-gd)
+ optimized libboost_system-vc100-mt-${BOOST_VERSION}
+ debug libboost_system-vc100-mt-gd-${BOOST_VERSION})
set(BOOST_FILESYSTEM_LIBRARY
- optimized libboost_filesystem-vc100-mt
- debug libboost_filesystem-vc100-mt-gd)
+ optimized libboost_filesystem-vc100-mt-${BOOST_VERSION}
+ debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})
endif (MSVC80)
elseif (DARWIN)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
--
cgit v1.2.3