From 55ce854a0c1b80a08461af0aea8e5bcd5ee1201f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 30 Nov 2016 16:18:01 -0500
Subject: [PATCH] DRTVWR-418: Once again, undo inappropriate autobuild.xml
expansions.
---
autobuild.xml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 9925730e4ab..251e9b64687 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3288,7 +3288,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DADDRESS_SIZE:STRING=32</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
</array>
@@ -3309,7 +3309,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DADDRESS_SIZE:STRING=32</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
@@ -3329,7 +3329,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
- <string>-DADDRESS_SIZE:STRING=32</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
</array>
@@ -3350,7 +3350,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
- <string>-DADDRESS_SIZE:STRING=32</string>
+ <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
</array>
@@ -3615,7 +3615,7 @@
<key>windows</key>
<map>
<key>build_directory</key>
- <string>build-vc120-32</string>
+ <string>build-vc120-$AUTOBUILD_ADDRSIZE</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
@@ -3631,7 +3631,7 @@
<key>options</key>
<array>
<string>/build</string>
- <string>RelWithDebInfo|Win32</string>
+ <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
</array>
</map>
<key>configure</key>
@@ -3643,7 +3643,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>Visual Studio 12</string>
+ <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
</array>
</map>
<key>default</key>
@@ -3664,7 +3664,7 @@
<key>options</key>
<array>
<string>/p:Configuration=RelWithDebInfo</string>
- <string>/p:Platform=Win32</string>
+ <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
<string>/t:Build</string>
<string>/p:useenv=true</string>
<string>/verbosity:minimal</string>
@@ -3681,7 +3681,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>Visual Studio 12</string>
+ <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
@@ -3703,7 +3703,7 @@
<key>options</key>
<array>
<string>/build</string>
- <string>Release|Win32</string>
+ <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
</array>
</map>
<key>configure</key>
@@ -3715,7 +3715,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>Visual Studio 12</string>
+ <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
</array>
</map>
<key>name</key>
@@ -3734,7 +3734,7 @@
<key>options</key>
<array>
<string>/p:Configuration=Release</string>
- <string>/p:Platform=Win32</string>
+ <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
<string>/t:Build</string>
<string>/p:useenv=true</string>
<string>/verbosity:minimal</string>
@@ -3751,7 +3751,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>Visual Studio 12</string>
+ <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
--
GitLab