diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-02-21 17:12:27 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-02-21 17:12:27 -0500 |
| commit | 038c555fc4254de62a477d1c83a2131970b0b2b5 (patch) | |
| tree | 7ff52992aca2f118c5d0040acd510ca411eb1155 /indra | |
| parent | 0ecb32bafb3f0082ddce07b16b51bba29a9cb3c4 (diff) | |
DRTVWR-418: In viewer64-mac-havok fork, turn on Xcode 8 Havok.
This is known not to work yet: the relevant Havok libraries are not being
bundled with llphysicsextensions, therefore the viewer can't link with any
Havok symbols.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Havok.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 243b9f5e34..811a126b8f 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -8,6 +8,11 @@ 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) +# HK_DISABLE_IMPLICIT_VVECTOR3_CONVERSION suppresses an intended conversion +# function which Xcode scolds us will unconditionally enter infinite +# recursion if called. This hides that function. +add_definitions("-DHK_DISABLE_IMPLICIT_VVECTOR3_CONVERSION") + set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) |