diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-10-11 13:55:36 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-10-11 13:55:36 +0800 |
| commit | a124103cf975571a3c664a3d329e6affda9ff2fb (patch) | |
| tree | 70ca564b882eb1b11176ad4a23cbeda61e5024ab | |
| parent | fc7795696bbbd25c08c9c659a12d444a9ae27d81 (diff) | |
Fix WebRTC & Havok linking on macOS x86-64
It wouldn't automatically detect the prebuilt libraries directory,
might be because of the older build environment I have for building
the macOS x86-64 binary.
| -rw-r--r-- | indra/cmake/LLPhysicsExtensions.cmake | 3 | ||||
| -rw-r--r-- | indra/cmake/WebRTC.cmake | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 6112621b5a..f9870e4a28 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -32,6 +32,9 @@ if (HAVOK) endif() elseif (HAVOK_TPV) use_prebuilt_binary(llphysicsextensions_tpv) + if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64) + target_link_directories( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE} ) + endif () target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions_tpv) else (HAVOK) use_prebuilt_binary(llphysicsextensions_stub) diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index e66c9a6295..5fda2f71b9 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -87,6 +87,10 @@ find_library(WEBRTC_LIBRARY target_link_libraries( ll::webrtc INTERFACE ${WEBRTC_LIBRARY} ) if (DARWIN) + if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64) + target_link_directories( ll::webrtc INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE} ) + target_link_libraries( ll::webrtc INTERFACE webrtc ) + endif () target_link_libraries( ll::webrtc INTERFACE ll::oslibraries ) execute_process( COMMAND lipo libwebrtc.a |