From 847a2738a30d8201210f0a802f72131243e04259 Mon Sep 17 00:00:00 2001 From: "Matthew Breindel (Falcon)" Date: Wed, 11 Jul 2012 14:55:01 -0700 Subject: Changed windows to always use havok Hybrid in RelWithDebInfo. Windows no longer uses Havok Debug. On other platforms, use of Debug vs Fulldebug in RelWithDebInfo is still governed by LL_DEBUG_HAVOK --- indra/cmake/Havok.cmake | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 3d63459f02..49b348e9f7 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -6,15 +6,13 @@ list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) -if (LL_DEBUG_HAVOK) - if (WIN32) - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) - else (WIN32) - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) - endif(WIN32) -else (LL_DEBUG_HAVOK) - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok) -endif (LL_DEBUG_HAVOK) + +if (LL_DEBUG_HAVOK AND NOT WIN32) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) +else (LL_DEBUG_HAVOK AND NOT WIN32) + # Always link relwithdebinfo to havok-hybrid on windows. + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) +endif (LL_DEBUG_HAVOK AND NOT WIN32) set(HAVOK_LIBS -- cgit v1.2.3