diff options
| author | Brad Linden <brad@lindenlab.com> | 2025-10-01 17:50:28 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2025-10-01 18:01:19 -0700 |
| commit | 589498fece769446310c085e9feb08ccd8400c2c (patch) | |
| tree | 489418a01fbca2802fc1de6bc537e9a523409aad /indra/cmake/LLPhysicsExtensions.cmake | |
| parent | 420bc85f97c0c19ffca4b4f26b70d171f7d5761e (diff) | |
Reenable havok llphysicsextensions on Darwin x86_64 with llphysicsextensions_stub used for aarch64
Diffstat (limited to 'indra/cmake/LLPhysicsExtensions.cmake')
| -rw-r--r-- | indra/cmake/LLPhysicsExtensions.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 80d243d9f8..6112621b5a 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -22,7 +22,14 @@ if (HAVOK) include(Havok) use_prebuilt_binary(llphysicsextensions_source) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src) - target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions) + if(DARWIN) + set(LLPHYSICSEXTENSIONS_STUB_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub) + # can't set these library dependencies per-arch here, need to do it using XCODE_ATTRIBUTE_OTHER_LDFLAGS[arch=*] in newview/CMakeLists.txt + #target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions) + #target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensionsstub) + else() + target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions) + endif() elseif (HAVOK_TPV) use_prebuilt_binary(llphysicsextensions_tpv) target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions_tpv) |