Skip to content
Snippets Groups Projects
Commit b265b899 authored by callum_linden's avatar callum_linden
Browse files

Update autobuild to point to new (VS2013) Havok files and fix up name mismatch

parent 6a552963
No related branches found
No related tags found
No related merge requests found
...@@ -1067,7 +1067,7 @@ ...@@ -1067,7 +1067,7 @@
<key>version</key> <key>version</key>
<string>0.0</string> <string>0.0</string>
</map> </map>
<key>havok_source</key> <key>havok-source</key>
<map> <map>
<key>copyright</key> <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> <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 @@ ...@@ -1078,7 +1078,7 @@
<key>license_file</key> <key>license_file</key>
<string>LICENSES/havok.txt</string> <string>LICENSES/havok.txt</string>
<key>name</key> <key>name</key>
<string>havok_source</string> <string>-source</string>
<key>platforms</key> <key>platforms</key>
<map> <map>
<key>darwin</key> <key>darwin</key>
...@@ -1110,9 +1110,9 @@ ...@@ -1110,9 +1110,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>cb723dcc66dcddd9d372625644ba57b6</string> <string>ab30ae74a665950d73ea559f019ff358</string>
<key>url</key> <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> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
......
...@@ -3,7 +3,7 @@ include(Prebuilt) ...@@ -3,7 +3,7 @@ include(Prebuilt)
if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") 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) set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source)
list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment