summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--autobuild.xml759
-rw-r--r--indra/cmake/Variables.cmake1
-rw-r--r--indra/llcommon/llversionviewer.h2
3 files changed, 102 insertions, 660 deletions
diff --git a/autobuild.xml b/autobuild.xml
index a31d280b6f..a9ab71da29 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1590,7 +1590,6 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=Debug</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
</array>
@@ -1598,7 +1597,7 @@
<key>name</key>
<string>Debug</string>
</map>
- <key>OpenSourceDebug</key>
+ <key>DebugOS</key>
<map>
<key>configure</key>
<map>
@@ -1607,67 +1606,23 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=Debug</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
- <string>-DWORD_SIZE:STRING=32</string>
- <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceDebug</string>
- </map>
- <key>OpenSourceRelWithDebInfo</key>
- <map>
- <key>configure</key>
- <map>
- <key>command</key>
- <string>cmake</string>
- <key>options</key>
- <array>
- <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+ <string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
- </map>
- <key>name</key>
- <string>OpenSourceRelWithDebInfo</string>
- </map>
- <key>OpenSourceRelease</key>
- <map>
- <key>configure</key>
- <map>
- <key>command</key>
- <string>cmake</string>
- <key>options</key>
+ <key>arguments</key>
<array>
- <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
- <string>-DWORD_SIZE:STRING=32</string>
- <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+ <string>../indra</string>
</array>
</map>
<key>name</key>
- <string>OpenSourceRelease</string>
+ <string>DebugOS</string>
</map>
- <key>OpenSourceStandAloneDebug</key>
+ <key>RelWithDebInfo</key>
<map>
- <key>configure</key>
+ <key>build</key>
<map>
- <key>command</key>
- <string>cmake</string>
- <key>options</key>
- <array>
- <string>-DCMAKE_BUILD_TYPE:STRING=Debug</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
- <string>-DWORD_SIZE:STRING=32</string>
- <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
- </array>
</map>
- <key>name</key>
- <string>OpenSourceStandAloneDebug</string>
- </map>
- <key>OpenSourceStandAloneRelWithDebInfo</key>
- <map>
<key>configure</key>
<map>
<key>command</key>
@@ -1675,15 +1630,14 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
</array>
</map>
<key>name</key>
- <string>OpenSourceStandAloneRelWithDebInfo</string>
+ <string>RelWithDebInfo</string>
</map>
- <key>OpenSourceStandAloneRelease</key>
+ <key>RelWithDebInfoOS</key>
<map>
<key>configure</key>
<map>
@@ -1691,34 +1645,18 @@
<string>cmake</string>
<key>options</key>
<array>
- <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
+ <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
<string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+ <string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
- </map>
- <key>name</key>
- <string>OpenSourceStandAloneRelease</string>
- </map>
- <key>RelWithDebInfo</key>
- <map>
- <key>build</key>
- <map>
- </map>
- <key>configure</key>
- <map>
- <key>command</key>
- <string>cmake</string>
- <key>options</key>
+ <key>arguments</key>
<array>
- <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
- <string>-DWORD_SIZE:STRING=32</string>
- <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+ <string>../indra</string>
</array>
</map>
<key>name</key>
- <string>RelWithDebInfo</string>
+ <string>RelWithDebInfoOS</string>
</map>
<key>Release</key>
<map>
@@ -1732,83 +1670,38 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+ <string>-DINSTALL_PROPRIETARY=FALSE</string>
+ <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
+ <string>-DLL_RELEASE_FOR_DOWNLOAD:BOOL=TRUE</string>
</array>
</map>
<key>name</key>
<string>Release</string>
</map>
- <!-- OPEN-1 WORKAROUND begin - to be removed when VC express is detected correctly -->
- <key>VCexpressRelWithDebInfo</key>
+ <key>ReleaseOS</key>
<map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
<key>command</key>
<string>cmake</string>
<key>options</key>
<array>
- <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
- <string>-DWORD_SIZE:STRING=32</string>
- <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
- </array>
- </map>
- <key>name</key>
- <string>VCexpressRelWithDebInfo</string>
- </map>
- <!-- OPEN-1 WORKAROUND end -->
- <!-- OPEN-1a WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
- <key>VC10msbuildRelWithDebInfo</key>
- <map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>command</key>
- <string>cmake</string>
- <key>options</key>
- <array>
- <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
+ <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
<string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+ <string>-DINSTALL_PROPRIETARY=FALSE</string>
+ <string>-DLL_RELEASE_FOR_DOWNLOAD:BOOL=YES</string>
</array>
- </map>
- <key>name</key>
- <string>VC10msbuildRelWithDebInfo</string>
- </map>
- <!-- OPEN-1a WORKAROUND end -->
- <!-- OPEN-1a Release WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
- <key>VC10msbuildRelease</key>
- <map>
- <key>configure</key>
- <map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
- <key>command</key>
- <string>cmake</string>
- <key>options</key>
- <array>
- <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
- <string>-DUNATTENDED:BOOL=OFF</string>
- <string>-DWORD_SIZE:STRING=32</string>
- <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
- </array>
</map>
<key>name</key>
- <string>VC10msbuildRelease</string>
+ <string>ReleaseOS</string>
</map>
- <!-- OPEN-1a Release WORKAROUND end -->
</map>
<key>name</key>
<string>common</string>
@@ -1848,15 +1741,12 @@
<array>
<string>-G</string>
<string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
- <string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
</array>
</map>
<key>name</key>
<string>Debug</string>
</map>
- <key>OpenSourceDebug</key>
+ <key>DebugOS</key>
<map>
<key>build</key>
<map>
@@ -1870,116 +1760,26 @@
</map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceDebug</string>
- </map>
- <key>OpenSourceRelWithDebInfo</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>xcodebuild</string>
- <key>options</key>
- <array>
- <string>-configuration RelWithDebInfo</string>
- <string>-project SecondLife.xcodeproj</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceRelWithDebInfo</string>
- </map>
- <key>OpenSourceRelease</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>xcodebuild</string>
- <key>options</key>
- <array>
- <string>-configuration Release</string>
- <string>-project SecondLife.xcodeproj</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
<key>options</key>
<array>
<string>-G</string>
<string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
</array>
</map>
<key>name</key>
- <string>OpenSourceRelease</string>
+ <string>DebugOS</string>
</map>
- <key>OpenSourceStandAloneDebug</key>
+ <key>RelWithDebInfo</key>
<map>
<key>build</key>
<map>
- <key>command</key>
- <string>xcodebuild</string>
- <key>options</key>
- <array>
- <string>-configuration Debug</string>
- <string>-project SecondLife.xcodeproj</string>
- </array>
- </map>
- <key>configure</key>
- <map>
<key>arguments</key>
<array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
+ <string>|</string>
+ <string>grep</string>
+ <string>-v</string>
+ <string>setenv</string>
</array>
- </map>
- <key>name</key>
- <string>OpenSourceStandAloneDebug</string>
- </map>
- <key>OpenSourceStandAloneRelWithDebInfo</key>
- <map>
- <key>build</key>
- <map>
<key>command</key>
<string>xcodebuild</string>
<key>options</key>
@@ -1998,15 +1798,14 @@
<array>
<string>-G</string>
<string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
</array>
</map>
+ <key>default</key>
+ <string>True</string>
<key>name</key>
- <string>OpenSourceStandAloneRelWithDebInfo</string>
+ <string>RelWithDebInfo</string>
</map>
- <key>OpenSourceStandAloneRelease</key>
+ <key>RelWithDebInfoOS</key>
<map>
<key>build</key>
<map>
@@ -2014,29 +1813,22 @@
<string>xcodebuild</string>
<key>options</key>
<array>
- <string>-configuration Release</string>
+ <string>-configuration RelWithDebInfo</string>
<string>-project SecondLife.xcodeproj</string>
</array>
</map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
<key>options</key>
<array>
<string>-G</string>
<string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
</array>
</map>
<key>name</key>
- <string>OpenSourceStandAloneRelease</string>
+ <string>RelWithDebInfoOS</string>
</map>
- <key>RelWithDebInfo</key>
+ <key>Release</key>
<map>
<key>build</key>
<map>
@@ -2051,7 +1843,7 @@
<string>xcodebuild</string>
<key>options</key>
<array>
- <string>-configuration RelWithDebInfo</string>
+ <string>-configuration Release</string>
<string>-project SecondLife.xcodeproj</string>
</array>
</map>
@@ -2065,27 +1857,15 @@
<array>
<string>-G</string>
<string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
- <string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
</array>
</map>
- <key>default</key>
- <string>True</string>
<key>name</key>
- <string>RelWithDebInfo</string>
+ <string>Release</string>
</map>
- <key>Release</key>
+ <key>ReleaseOS</key>
<map>
<key>build</key>
<map>
- <key>arguments</key>
- <array>
- <string>|</string>
- <string>grep</string>
- <string>-v</string>
- <string>setenv</string>
- </array>
<key>command</key>
<string>xcodebuild</string>
<key>options</key>
@@ -2096,21 +1876,14 @@
</map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
<key>options</key>
<array>
<string>-G</string>
<string>'Xcode'</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
- <string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
</array>
</map>
<key>name</key>
- <string>Release</string>
+ <string>ReleaseOS</string>
</map>
</map>
<key>name</key>
@@ -2143,102 +1916,12 @@
<array>
<string>-G</string>
<string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
- <string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
</array>
</map>
<key>name</key>
<string>Debug</string>
</map>
- <key>OpenSourceDebug</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>make</string>
- <key>options</key>
- <array>
- <string>-j 12</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceDebug</string>
- </map>
- <key>OpenSourceRelWithDebInfo</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>make</string>
- <key>options</key>
- <array>
- <string>-j 12</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceRelWithDebInfo</string>
- </map>
- <key>OpenSourceRelease</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>make</string>
- <key>options</key>
- <array>
- <string>-j 12</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceRelease</string>
- </map>
- <key>OpenSourceStandAloneDebug</key>
+ <key>DebugOS</key>
<map>
<key>build</key>
<map>
@@ -2246,28 +1929,21 @@
<string>make</string>
<key>options</key>
<array>
- <string>-j 12</string>
+ <string>-j 2</string>
</array>
</map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
<key>options</key>
<array>
<string>-G</string>
<string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
</array>
</map>
<key>name</key>
- <string>OpenSourceStandAloneDebug</string>
+ <string>DebugOS</string>
</map>
- <key>OpenSourceStandAloneRelWithDebInfo</key>
+ <key>RelWithDebInfo</key>
<map>
<key>build</key>
<map>
@@ -2288,15 +1964,14 @@
<array>
<string>-G</string>
<string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
</array>
</map>
+ <key>default</key>
+ <string>True</string>
<key>name</key>
- <string>OpenSourceStandAloneRelWithDebInfo</string>
+ <string>RelWithDebInfo</string>
</map>
- <key>OpenSourceStandAloneRelease</key>
+ <key>RelWithDebInfoOS</key>
<map>
<key>build</key>
<map>
@@ -2304,28 +1979,21 @@
<string>make</string>
<key>options</key>
<array>
- <string>-j 12</string>
+ <string>-j 2</string>
</array>
</map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
<key>options</key>
<array>
<string>-G</string>
<string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
</array>
</map>
<key>name</key>
- <string>OpenSourceStandAloneRelease</string>
+ <string>RelWithDebInfoOS</string>
</map>
- <key>RelWithDebInfo</key>
+ <key>Release</key>
<map>
<key>build</key>
<map>
@@ -2346,17 +2014,12 @@
<array>
<string>-G</string>
<string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
- <string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
</array>
</map>
- <key>default</key>
- <string>True</string>
<key>name</key>
- <string>RelWithDebInfo</string>
+ <string>Release</string>
</map>
- <key>Release</key>
+ <key>ReleaseOS</key>
<map>
<key>build</key>
<map>
@@ -2364,26 +2027,19 @@
<string>make</string>
<key>options</key>
<array>
- <string>-j 12</string>
+ <string>-j 2</string>
</array>
</map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
<key>options</key>
<array>
<string>-G</string>
<string>'Unix Makefiles'</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
- <string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
</array>
</map>
<key>name</key>
- <string>Release</string>
+ <string>ReleaseOS</string>
</map>
<key>default</key>
<map>
@@ -2437,15 +2093,12 @@
<array>
<string>-G</string>
<string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
- <string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
</array>
</map>
<key>name</key>
<string>Debug</string>
</map>
- <key>OpenSourceDebug</key>
+ <key>DebugOS</key>
<map>
<key>build</key>
<map>
@@ -2454,108 +2107,35 @@
<string>SecondLife.sln</string>
</array>
<key>command</key>
- <string>devenv.com</string>
- <key>options</key>
- <array>
- <string>/build</string>
- <string>Debug</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>..\indra</string>
- <string>&amp;&amp;</string>
- <string>..\indra\tools\vstool\VSTool.exe</string>
- <string>--solution</string>
- <string>SecondLife.sln</string>
- <string>--config</string>
- <string>Debug</string>
- <string>--startup</string>
- <string>secondlife-bin</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceDebug</string>
- </map>
- <key>OpenSourceRelWithDebInfo</key>
- <map>
- <key>build</key>
- <map>
- <key>arguments</key>
- <array>
- <string>SecondLife.sln</string>
- </array>
- <key>command</key>
- <string>devenv.com</string>
- <key>options</key>
- <array>
- <string>/build</string>
- <string>RelWithDebInfo</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceRelWithDebInfo</string>
- </map>
- <key>OpenSourceRelease</key>
- <map>
- <key>build</key>
- <map>
- <key>arguments</key>
- <array>
- <string>SecondLife.sln</string>
- </array>
- <key>command</key>
- <string>devenv.com</string>
+ <string>msbuild.exe</string>
<key>options</key>
<array>
- <string>/build</string>
- <string>Release</string>
+ <string>/p:Configuration=Debug</string>
+ <string>/p:Platform=Win32</string>
+ <string>/t:Build</string>
+ <string>/p:useenv=true</string>
+ <string>/verbosity:minimal</string>
+ <string>/toolsversion:4.0</string>
+ <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
</array>
</map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
<key>options</key>
<array>
<string>-G</string>
<string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
+ <string>-DUNATTENDED:BOOL=ON</string>
+ <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
+ <string>-DINSTALL_PROPRIETARY=TRUE</string>
+ <string>-DUSE_KDU=FALSE</string>
<string>-DFMOD=FALSE</string>
</array>
</map>
<key>name</key>
- <string>OpenSourceRelease</string>
+ <string>DebugOS</string>
</map>
- <key>OpenSourceStandAloneDebug</key>
+ <key>RelWithDebInfo</key>
<map>
<key>build</key>
<map>
@@ -2564,11 +2144,11 @@
<string>SecondLife.sln</string>
</array>
<key>command</key>
- <string>devenv.com</string>
+ <string>BuildConsole</string>
<key>options</key>
<array>
<string>/build</string>
- <string>Debug</string>
+ <string>"/cfg=RelWithDebInfo|Win32"</string>
</array>
</map>
<key>configure</key>
@@ -2589,83 +2169,14 @@
<array>
<string>-G</string>
<string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceStandAloneDebug</string>
- </map>
- <key>OpenSourceStandAloneRelWithDebInfo</key>
- <map>
- <key>build</key>
- <map>
- <key>arguments</key>
- <array>
- <string>SecondLife.sln</string>
- </array>
- <key>command</key>
- <string>devenv.com</string>
- <key>options</key>
- <array>
- <string>/build</string>
- <string>RelWithDebInfo</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>OpenSourceStandAloneRelWithDebInfo</string>
- </map>
- <key>OpenSourceStandAloneRelease</key>
- <map>
- <key>build</key>
- <map>
- <key>arguments</key>
- <array>
- <string>SecondLife.sln</string>
- </array>
- <key>command</key>
- <string>devenv.com</string>
- <key>options</key>
- <array>
- <string>/build</string>
- <string>Release</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>arguments</key>
- <array>
- <string>../indra</string>
- </array>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=TRUE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
</array>
</map>
+ <key>default</key>
+ <string>True</string>
<key>name</key>
- <string>OpenSourceStandAloneRelease</string>
+ <string>RelWithDebInfo</string>
</map>
- <key>RelWithDebInfo</key>
+ <key>RelWithDebInfoOS</key>
<map>
<key>build</key>
<map>
@@ -2674,40 +2185,33 @@
<string>SecondLife.sln</string>
</array>
<key>command</key>
- <string>BuildConsole</string>
+ <string>msbuild.exe</string>
<key>options</key>
<array>
- <string>/build</string>
- <string>"/cfg=RelWithDebInfo|Win32"</string>
+ <string>/p:Configuration=RelWithDebInfo</string>
+ <string>/p:Platform=Win32</string>
+ <string>/t:Build</string>
+ <string>/p:useenv=true</string>
+ <string>/verbosity:minimal</string>
+ <string>/toolsversion:4.0</string>
+ <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
</array>
</map>
<key>configure</key>
<map>
- <key>arguments</key>
- <array>
- <string>..\indra</string>
- <string>&amp;&amp;</string>
- <string>..\indra\tools\vstool\VSTool.exe</string>
- <string>--solution</string>
- <string>SecondLife.sln</string>
- <string>--config</string>
- <string>RelWithDebInfo</string>
- <string>--startup</string>
- <string>secondlife-bin</string>
- </array>
<key>options</key>
<array>
<string>-G</string>
<string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
+ <string>-DUNATTENDED:BOOL=ON</string>
+ <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
+ <string>-DUSE_KDU=FALSE</string>
+ <string>-DFMOD=FALSE</string>
</array>
</map>
- <key>default</key>
- <string>True</string>
<key>name</key>
- <string>RelWithDebInfo</string>
+ <string>RelWithDebInfoOS</string>
</map>
<key>Release</key>
<map>
@@ -2744,95 +2248,31 @@
<array>
<string>-G</string>
<string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=OFF</string>
- <string>-DINSTALL_PROPRIETARY=TRUE</string>
- <string>-DFMOD=TRUE</string>
</array>
</map>
<key>name</key>
<string>Release</string>
</map>
- <!-- OPEN-1 WORKAROUND begin - to be removed when VC express is detected correctly -->
- <key>VCexpressRelWithDebInfo</key>
+ <key>ReleaseOS</key>
<map>
<key>build</key>
<map>
<key>arguments</key>
<array>
- <string>"RelWithDebInfo|Win32"</string>
- </array>
- <key>command</key>
- <string>vcbuild.exe</string>
- <key>options</key>
- <array>
- <string>/u</string>
<string>SecondLife.sln</string>
</array>
- </map>
- <key>configure</key>
- <map>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>VCexpressRelWithDebInfo</string>
- </map>
- <!-- OPEN-1 WORKAROUND end -->
- <!-- OPEN-1a WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
- <key>VC10msbuildRelWithDebInfo</key>
- <map>
- <key>build</key>
- <map>
<key>command</key>
<string>msbuild.exe</string>
<key>options</key>
<array>
- <string>SecondLife.sln</string>
- <string>/verbosity:minimal</string>
- <string>/t:build</string>
- <string>/p:Configuration=RelWithDebInfo</string>
- <string>/p:Platform=Win32</string>
- <string>/p:"VCBuildAdditionalOptions= /useenv"</string>
- <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
- </array>
- </map>
- <key>configure</key>
- <map>
- <key>options</key>
- <array>
- <string>-G</string>
- <string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>VC10msbuildRelWithDebInfo</string>
- </map>
- <!-- OPEN-1a WORKAROUND end -->
- <!-- OPEN-1a Release WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
- <key>VC10msbuildRelease</key>
- <map>
- <key>build</key>
- <map>
- <key>command</key>
- <string>msbuild.exe</string>
- <key>options</key>
- <array>
- <string>SecondLife.sln</string>
- <string>/t:build</string>
<string>/p:Configuration=Release</string>
<string>/p:Platform=Win32</string>
- <string>/p:"VCBuildAdditionalOptions= /useenv"</string>
+ <string>/t:Build</string>
+ <string>/p:useenv=true</string>
+ <string>/verbosity:minimal</string>
+ <string>/toolsversion:4.0</string>
<string>/p:"VCBuildAdditionalOptions= /incremental"</string>
- </array>
+ </array>
</map>
<key>configure</key>
<map>
@@ -2840,15 +2280,16 @@
<array>
<string>-G</string>
<string>"Visual Studio 10"</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
+ <string>-DUNATTENDED:BOOL=ON</string>
+ <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
+ <string>-DINSTALL_PROPRIETARY=TRUE</string>
+ <string>-DUSE_KDU=FALSE</string>
<string>-DFMOD=FALSE</string>
</array>
</map>
<key>name</key>
- <string>VC10msbuildRelease</string>
+ <string>ReleaseOS</string>
</map>
- <!-- OPEN-1a WORKAROUND end -->
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 77dd34d122..8c9c375790 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -135,6 +135,7 @@ set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for
set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
+set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.")
if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
set(SERVER ON CACHE BOOL "Build Second Life server software.")
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index bd6df962a1..df5afcbf1c 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -29,7 +29,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 6;
-const S32 LL_VERSION_PATCH = 5;
+const S32 LL_VERSION_PATCH = 6;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 15:06:31 +0000