diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-05 10:49:47 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-05 10:49:47 -0500 |
| commit | 4ca084f7a06acc4ef861c1f4df2f857f8836b85e (patch) | |
| tree | 90ec9c8e24f42695fd054db650c6d4933232a121 /autobuild.xml | |
| parent | cda19375cb61e851bb2343edcb9e21e36b3228ee (diff) | |
DRTVWR-418: Another round (hopefully the last) of fixing $variables.
Diffstat (limited to 'autobuild.xml')
| -rw-r--r-- | autobuild.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/autobuild.xml b/autobuild.xml index 7795b09bca..c33f24477e 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=64</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=64</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=64</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=64</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-64</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|x64</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 Win64</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=x64</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 Win64</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|x64</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 Win64</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=x64</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 Win64</string> + <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>-DUNATTENDED:BOOL=ON</string> <string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DUSE_KDU=FALSE</string> |