diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2025-10-08 09:33:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-08 09:33:18 -0700 |
| commit | dd59dd5d657c1827d84a432c4aaa6829dad245c5 (patch) | |
| tree | c0215cd25f9caed6de5929e768f4abc35f261509 /indra/cmake/LLPhysicsExtensions.cmake | |
| parent | 99d8f22c99e54ba4c22a2b5834bba2c0de549fca (diff) | |
| parent | c440843513b9d9688db019034be4d8c24a3e6f8b (diff) | |
Merge pull request #4775 from secondlife/brad/llphysicsextensions-fallback
Reenabled Havok LLPhysicsExtensions for Rosetta
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) |