summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcallum@lindenlab.com <callum@lindenlab.com>2017-02-21 09:49:36 -0800
committercallum@lindenlab.com <callum@lindenlab.com>2017-02-21 09:49:36 -0800
commit135d96dacae6610d280e3cfafeec391e4ea466c8 (patch)
tree17d6057c2fd1f85c090cff363efae05f0be065d5
parentbf90329dea911174ba49d0e897c55535973f63ad (diff)
parentd18060e41c840f2e617c4e9a48b5070277fc24c5 (diff)
Automated merge with head of lindenlab/viewer64
-rw-r--r--autobuild.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 2e2f4f9a52..975a4ebd64 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3357,6 +3357,7 @@
<array>
<string>-G</string>
<string>Xcode</string>
+ <string>-DHAVOK:BOOL=OFF</string>
</array>
</map>
<key>default</key>
@@ -3385,6 +3386,7 @@
<array>
<string>-G</string>
<string>Xcode</string>
+ <string>-DHAVOK:BOOL=OFF</string>
</array>
</map>
<key>name</key>
@@ -3419,6 +3421,7 @@
<array>
<string>-G</string>
<string>Xcode</string>
+ <string>-DHAVOK:BOOL=OFF</string>
</array>
</map>
<key>name</key>
@@ -3445,6 +3448,7 @@
<array>
<string>-G</string>
<string>Xcode</string>
+ <string>-DHAVOK:BOOL=OFF</string>
</array>
</map>
<key>name</key>