Skip to content
Snippets Groups Projects
Commit 7236b1f4 authored by Todd Stinson's avatar Todd Stinson
Browse files

Removing the havok dependency from the viewer build as this is now resolved in... 

Removing the havok dependency from the viewer build as this is now resolved in the llpathinglib library itself.
parent b45abfa3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
autobuild.xml
+ 2
− 2
View file @ 7236b1f4
...@@ -1822,9 +1822,9 @@ ...@@ -1822,9 +1822,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>62aa406dffd2e34d8469476dee3f2c50</string> <string>17685735abeb980d4480104e267fdc10</string>
<key>url</key> <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> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
......
indra/cmake/Havok.cmake deleted 100644 → 0
+ 0
− 108
View file @ b45abfa3
# -*- 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}
)
indra/newview/CMakeLists.txt
+ 0
− 2
View file @ 7236b1f4
...@@ -13,7 +13,6 @@ include(EXPAT) ...@@ -13,7 +13,6 @@ include(EXPAT)
include(FMOD) include(FMOD)
include(OPENAL) include(OPENAL)
include(FindOpenGL) include(FindOpenGL)
include(Havok)
include(JsonCpp) include(JsonCpp)
include(LLAudio) include(LLAudio)
include(LLCharacter) include(LLCharacter)
...@@ -1735,7 +1734,6 @@ endif (WINDOWS) ...@@ -1735,7 +1734,6 @@ endif (WINDOWS)
# that they depend upon. -brad # that they depend upon. -brad
target_link_libraries(${VIEWER_BINARY_NAME} target_link_libraries(${VIEWER_BINARY_NAME}
${LLPATHING_LIBRARIES} ${LLPATHING_LIBRARIES}
${HK_LIBRARIES}
${UPDATER_LIBRARIES} ${UPDATER_LIBRARIES}
${GOOGLE_PERFTOOLS_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES}
${LLAUDIO_LIBRARIES} ${LLAUDIO_LIBRARIES}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment