diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-10-17 19:30:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-17 19:30:49 -0400 |
| commit | 3ca323db9e71a342bf1ca895e23ab180ce048add (patch) | |
| tree | cd52ee85740d6cf788e918187c2b7c196407a7a6 /indra/cmake/LLPhysicsExtensions.cmake | |
| parent | 01a799495b93cb9f7d5b9298bfb57afc99e47e1b (diff) | |
| parent | bbc2ad8fc50b2efb19a40a2db57043690addc492 (diff) | |
Merge pull request #4850 from secondlife/geenz/main-to-develop
Catch some commits that didn't make it back to develop.
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 bb6cb703d2..25563546eb 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -22,8 +22,15 @@ 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) target_compile_definitions( llphysicsextensions_impl INTERFACE LL_HAVOK=1 ) + 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) if(WINDOWS) |