From 40dd1e637a5497a75f6ebcf429b940806fa01d16 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Fri, 2 Dec 2016 16:39:29 -0800
Subject: [PATCH] Pull in fixed FMODEX package with 64 bit fmodex DLL correctly
named (fmodex64.dll vs fmodex.dll)
---
autobuild.xml | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 251e9b64687..fd5dac63625 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -686,9 +686,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>23876d471ef04d28b73a931057758872</string>
+ <string>ad5bb66f2aaa12636b5a69a020ea9f18</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/358/899/fmodex-4.44.61.500350-windows-500350.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1191/2796/fmodex-4.44.61.501175-windows-501175.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -698,16 +698,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>f87fd527e1cca5b1b64090c5afb04cdb</string>
+ <string>6722f0efc2b55542bd71514b9a09e377</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/357/896/fmodex-4.44.61.500350-windows64-500350.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1190/2791/fmodex-4.44.61.501175-windows64-501175.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>4.44.61.500350</string>
+ <string>4.44.61.501175</string>
</map>
<key>fontconfig</key>
<map>
@@ -3288,7 +3288,7 @@
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
- <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
+ <string>-DADDRESS_SIZE:STRING=64</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=$AUTOBUILD_ADDRSIZE</string>
+ <string>-DADDRESS_SIZE:STRING=64</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=$AUTOBUILD_ADDRSIZE</string>
+ <string>-DADDRESS_SIZE:STRING=64</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=$AUTOBUILD_ADDRSIZE</string>
+ <string>-DADDRESS_SIZE:STRING=64</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-$AUTOBUILD_ADDRSIZE</string>
+ <string>build-vc120-64</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
@@ -3631,7 +3631,7 @@
<key>options</key>
<array>
<string>/build</string>
- <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>RelWithDebInfo|x64</string>
</array>
</map>
<key>configure</key>
@@ -3643,7 +3643,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>Visual Studio 12 Win64</string>
</array>
</map>
<key>default</key>
@@ -3664,7 +3664,7 @@
<key>options</key>
<array>
<string>/p:Configuration=RelWithDebInfo</string>
- <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>/p:Platform=x64</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>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>Visual Studio 12 Win64</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|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>Release|x64</string>
</array>
</map>
<key>configure</key>
@@ -3715,7 +3715,7 @@
<key>options</key>
<array>
<string>-G</string>
- <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>Visual Studio 12 Win64</string>
</array>
</map>
<key>name</key>
@@ -3734,7 +3734,7 @@
<key>options</key>
<array>
<string>/p:Configuration=Release</string>
- <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>/p:Platform=x64</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>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+ <string>Visual Studio 12 Win64</string>
<string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string>
--
GitLab