diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-10-21 21:11:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-21 21:11:05 +0300 |
| commit | 4e2a9667bda1a1980993ae453dfe6ff38dd1835a (patch) | |
| tree | 64542828f2ebbf2e1bbe2516073a7dfbe9b5a075 /indra/llprimitive | |
| parent | 01823996196c11aea905200fe267463d520d285b (diff) | |
| parent | 0d5138c1f93a77ff52551a76d0d8575413550859 (diff) | |
Merge from secondlife/develop into 2025.08
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 9e90314a51..ff0cad58d6 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -65,15 +65,18 @@ target_link_libraries(llprimitive llxml llcharacter llrender - llphysicsextensions_impl ll::colladadom ll::glm ) -if (TARGET llconvexdecomposition) +if (HAVOK OR HAVOK_TPV) target_link_libraries(llprimitive - llconvexdecomposition - ) + llphysicsextensions_impl + ) +else() + target_link_libraries(llprimitive + llphysicsextensionsos + ) endif () #add unit tests |