From b265b899d4b0c936eb70f62a165ef176ceb75767 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 17 Dec 2014 16:24:31 -0800
Subject: [PATCH] Update autobuild to point to new (VS2013) Havok files and fix
up name mismatch
---
autobuild.xml | 8 ++++----
indra/cmake/Havok.cmake | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 9e9dd0683fb..24c020b08a1 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1067,7 +1067,7 @@
<key>version</key>
<string>0.0</string>
</map>
- <key>havok_source</key>
+ <key>havok-source</key>
<map>
<key>copyright</key>
<string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
@@ -1078,7 +1078,7 @@
<key>license_file</key>
<string>LICENSES/havok.txt</string>
<key>name</key>
- <string>havok_source</string>
+ <string>-source</string>
<key>platforms</key>
<map>
<key>darwin</key>
@@ -1110,9 +1110,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>cb723dcc66dcddd9d372625644ba57b6</string>
+ <string>ab30ae74a665950d73ea559f019ff358</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297312/arch/CYGWIN/installer/havok_source-2012.1-windows-297312.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297566/arch/CYGWIN/installer/havok_source-2012.1-windows-297566.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake
index fceca139622..99e73341184 100755
--- a/indra/cmake/Havok.cmake
+++ b/indra/cmake/Havok.cmake
@@ -3,7 +3,7 @@ include(Prebuilt)
if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
-use_prebuilt_binary(havok_source)
+use_prebuilt_binary(havok-source)
set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source)
list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo)
--
GitLab