From b265b899d4b0c936eb70f62a165ef176ceb75767 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 17 Dec 2014 16:24:31 -0800 Subject: 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 9e9dd0683f..24c020b08a 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1067,7 +1067,7 @@ version 0.0 - havok_source + havok-source copyright Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details. @@ -1078,7 +1078,7 @@ license_file LICENSES/havok.txt name - havok_source + -source platforms darwin @@ -1110,9 +1110,9 @@ archive hash - cb723dcc66dcddd9d372625644ba57b6 + ab30ae74a665950d73ea559f019ff358 url - 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 + 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 name windows diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index fceca13962..99e7334118 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) -- cgit v1.2.3