diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/Havok.cmake | 52 | ||||
| -rw-r--r-- | indra/cmake/LLConvexDecomposition.cmake | 10 | ||||
| -rw-r--r-- | indra/cmake/LLPathingLib.cmake | 16 |
4 files changed, 75 insertions, 7 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 0266239454..98eeed09b3 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -46,7 +46,7 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2 -D_SECURE_STL=0" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob0 -D_SECURE_STL=0" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" @@ -62,7 +62,7 @@ if (WINDOWS) /D_UNICODE /GS /TP - /W2 + /W3 /c /Zc:forScope /nologo diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake new file mode 100644 index 0000000000..1b355792d0 --- /dev/null +++ b/indra/cmake/Havok.cmake @@ -0,0 +1,52 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(havok) +set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include/havok/Source) +if (CMAKE_BUILD_TYPE MATCHES "Debug") + set(HAVOK_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/debug/havok) +else (CMAKE_BUILD_TYPE MATCHES "Debug") + set(HAVOK_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/release/havok) +endif (CMAKE_BUILD_TYPE MATCHES "Debug") + +find_library(HK_BASE_LIB hkBase PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_COMPAT_LIB hkCompat PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_GEOMETRY_UTILITIES_LIB hkGeometryUtilities PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_INTERNAL_LIB hkInternal PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_SERIALIZE_LIB hkSerialize PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_SCENEDATA_LIB hkSceneData PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_COLLIDE_LIB hkpCollide PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_UTILITIES_LIB hkpUtilities PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_CONSTRAINTSOLVER_LIB hkpConstraintSolver PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_DYNAMICS_LIB hkpDynamics PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_INTERNAL_LIB hkpInternal PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_AI_INTERNAL_LIB hkaiInternal PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_AI_PATHFINDING_LIB hkaiPathfinding PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_AI_AIPHYSICSBRIDGE_LIB hkaiaiphysicsbridge PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_UTILITIES_LIB hkputilities PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_CD_INTERNAL_LIB hkcdinternal PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_VEHICLE_LIB hkpVehicle PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_VISUALIZE_LIB hkVisualize PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_AI_VISUALIZE_LIB hkaiVisualize PATHS ${HAVOK_LIBRARY_PATH}) + +set(HK_LIBRARIES + ${HK_BASE_LIB} + ${HK_COMPAT_LIB} + ${HK_GEOMETRY_UTILITIES_LIB} + ${HK_INTERNAL_LIB} + ${HK_SERIALIZE_LIB} + ${HK_SCENEDATA_LIB} + ${HK_PHYS_COLLIDE_LIB} + ${HK_PHYS_UTILITIES_LIB} + ${HK_PHYS_CONSTRAINTSOLVER_LIB} + ${HK_PHYS_DYNAMICS_LIB} + ${HK_PHYS_INTERNAL_LIB} + ${HK_AI_INTERNAL_LIB} + ${HK_AI_PATHFINDING_LIB} + ${HK_AI_AIPHYSICSBRIDGE_LIB} + ${HK_PHYS_UTILITIES_LIB} + ${HK_CD_INTERNAL_LIB} + ${HK_PHYS_VEHICLE_LIB} + ${HK_VISUALIZE_LIB} + ${HK_AI_VISUALIZE_LIB} +) diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake index 8e44504782..1731853300 100644 --- a/indra/cmake/LLConvexDecomposition.cmake +++ b/indra/cmake/LLConvexDecomposition.cmake @@ -3,10 +3,10 @@ include(Prebuilt) set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) -if (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llconvexdecomposition) - set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) -else (INSTALL_PROPRIETARY AND NOT STANDALONE) +# if (INSTALL_PROPRIETARY AND NOT STANDALONE) +# use_prebuilt_binary(llconvexdecomposition) +# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) +# else (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(llconvexdecompositionstub) set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) -endif (INSTALL_PROPRIETARY AND NOT STANDALONE) +# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake new file mode 100644 index 0000000000..b92190ad0a --- /dev/null +++ b/indra/cmake/LLPathingLib.cmake @@ -0,0 +1,16 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(llpathinglib) +set(LLPATHING_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include) +if (CMAKE_BUILD_TYPE MATCHES "Debug") + set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) +else (CMAKE_BUILD_TYPE MATCHES "Debug") + set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) +endif (CMAKE_BUILD_TYPE MATCHES "Debug") + +find_library(LL_PATHING_LIB llpathinglib PATHS ${LLPATHING_LIBRARY_PATH}) + +set(LLPATHING_LIBRARIES + ${LL_PATHING_LIB} +) |