diff options
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/cmake/Havok.cmake | 108 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
3 files changed, 2 insertions, 112 deletions
diff --git a/autobuild.xml b/autobuild.xml index 175dcd7dd2..73a721fad3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1822,9 +1822,9 @@ <key>archive</key> <map> <key>hash</key> - <string>62aa406dffd2e34d8469476dee3f2c50</string> + <string>17685735abeb980d4480104e267fdc10</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247247/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120105.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247296/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120106.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake deleted file mode 100644 index 949575709c..0000000000 --- a/indra/cmake/Havok.cmake +++ /dev/null @@ -1,108 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -use_prebuilt_binary(havok) -set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include/havok/Source) - -set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/debug/havok) -set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/release/havok) - -find_library(HK_BASE_DEBUG_LIB hkBase PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_COMPAT_DEBUG_LIB hkCompat PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_GEOMETRY_UTILITIES_DEBUG_LIB hkGeometryUtilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_INTERNAL_DEBUG_LIB hkInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_SERIALIZE_DEBUG_LIB hkSerialize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_SCENEDATA_DEBUG_LIB hkSceneData PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_COLLIDE_DEBUG_LIB hkpCollide PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_DEBUG_LIB hkpUtilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_CONSTRAINTSOLVER_DEBUG_LIB hkpConstraintSolver PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_DYNAMICS_DEBUG_LIB hkpDynamics PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_INTERNAL_DEBUG_LIB hkpInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_AI_INTERNAL_DEBUG_LIB hkaiInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_AI_PATHFINDING_DEBUG_LIB hkaiPathfinding PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_AI_AIPHYSICSBRIDGE_DEBUG_LIB hkaiaiphysicsbridge PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_DEBUG_LIB hkputilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_CD_INTERNAL_DEBUG_LIB hkcdinternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_VEHICLE_DEBUG_LIB hkpVehicle PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_VISUALIZE_DEBUG_LIB hkVisualize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_AI_VISUALIZE_DEBUG_LIB hkaiVisualize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) - -find_library(HK_BASE_RELEASE_LIB hkBase PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_COMPAT_RELEASE_LIB hkCompat PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_GEOMETRY_UTILITIES_RELEASE_LIB hkGeometryUtilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_INTERNAL_RELEASE_LIB hkInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_SERIALIZE_RELEASE_LIB hkSerialize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_SCENEDATA_RELEASE_LIB hkSceneData PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_COLLIDE_RELEASE_LIB hkpCollide PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_RELEASE_LIB hkpUtilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_CONSTRAINTSOLVER_RELEASE_LIB hkpConstraintSolver PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_DYNAMICS_RELEASE_LIB hkpDynamics PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_INTERNAL_RELEASE_LIB hkpInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_AI_INTERNAL_RELEASE_LIB hkaiInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_AI_PATHFINDING_RELEASE_LIB hkaiPathfinding PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_AI_AIPHYSICSBRIDGE_RELEASE_LIB hkaiaiphysicsbridge PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_RELEASE_LIB hkputilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_CD_INTERNAL_RELEASE_LIB hkcdinternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_VEHICLE_RELEASE_LIB hkpVehicle PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_VISUALIZE_RELEASE_LIB hkVisualize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_AI_VISUALIZE_RELEASE_LIB hkaiVisualize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) - -set(HK_LIBRARIES - - debug ${HK_BASE_DEBUG_LIB} - optimized ${HK_BASE_RELEASE_LIB} - - debug ${HK_COMPAT_DEBUG_LIB} - optimized ${HK_COMPAT_RELEASE_LIB} - - debug ${HK_GEOMETRY_UTILITIES_DEBUG_LIB} - optimized ${HK_GEOMETRY_UTILITIES_RELEASE_LIB} - - debug ${HK_INTERNAL_DEBUG_LIB} - optimized ${HK_INTERNAL_RELEASE_LIB} - - debug ${HK_SERIALIZE_DEBUG_LIB} - optimized ${HK_SERIALIZE_RELEASE_LIB} - - debug ${HK_SCENEDATA_DEBUG_LIB} - optimized ${HK_SCENEDATA_RELEASE_LIB} - - debug ${HK_PHYS_COLLIDE_DEBUG_LIB} - optimized ${HK_PHYS_COLLIDE_RELEASE_LIB} - - debug ${HK_PHYS_UTILITIES_DEBUG_LIB} - optimized ${HK_PHYS_UTILITIES_RELEASE_LIB} - - debug ${HK_PHYS_CONSTRAINTSOLVER_DEBUG_LIB} - optimized ${HK_PHYS_CONSTRAINTSOLVER_RELEASE_LIB} - - debug ${HK_PHYS_DYNAMICS_DEBUG_LIB} - optimized ${HK_PHYS_DYNAMICS_RELEASE_LIB} - - debug ${HK_PHYS_INTERNAL_DEBUG_LIB} - optimized ${HK_PHYS_INTERNAL_RELEASE_LIB} - - debug ${HK_AI_INTERNAL_DEBUG_LIB} - optimized ${HK_AI_INTERNAL_RELEASE_LIB} - - debug ${HK_AI_PATHFINDING_DEBUG_LIB} - optimized ${HK_AI_PATHFINDING_RELEASE_LIB} - - debug ${HK_AI_AIPHYSICSBRIDGE_DEBUG_LIB} - optimized ${HK_AI_AIPHYSICSBRIDGE_RELEASE_LIB} - - debug ${HK_PHYS_UTILITIES_DEBUG_LIB} - optimized ${HK_PHYS_UTILITIES_RELEASE_LIB} - - debug ${HK_CD_INTERNAL_DEBUG_LIB} - optimized ${HK_CD_INTERNAL_RELEASE_LIB} - - debug ${HK_PHYS_VEHICLE_DEBUG_LIB} - optimized ${HK_PHYS_VEHICLE_RELEASE_LIB} - - debug ${HK_VISUALIZE_DEBUG_LIB} - optimized ${HK_VISUALIZE_RELEASE_LIB} - - debug ${HK_AI_VISUALIZE_DEBUG_LIB} - optimized ${HK_AI_VISUALIZE_RELEASE_LIB} -) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 13ef8f1848..31081e32de 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -13,7 +13,6 @@ include(EXPAT) include(FMOD) include(OPENAL) include(FindOpenGL) -include(Havok) include(JsonCpp) include(LLAudio) include(LLCharacter) @@ -1735,7 +1734,6 @@ endif (WINDOWS) # that they depend upon. -brad target_link_libraries(${VIEWER_BINARY_NAME} ${LLPATHING_LIBRARIES} - ${HK_LIBRARIES} ${UPDATER_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES} ${LLAUDIO_LIBRARIES} |