diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-25 18:46:19 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-25 18:46:19 -0500 |
| commit | 739358779267413887a57d2a6d6b651312245495 (patch) | |
| tree | a9196a00c7e372b7f38f43f46f2682d4139e9d8c /indra/newview | |
| parent | 50b67f052a440fba54a05fe32320f6bb84ea43cc (diff) | |
PATH-192 WIP adding convex decomp to pathing
First pass at using new llPhysicsExtensions library which
combines pathing and convex decomp.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 81ab4116b0..9a15b65f83 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -17,13 +17,12 @@ include(JsonCpp) include(LLAudio) include(LLCharacter) include(LLCommon) -include(LLConvexDecomposition) include(LLImage) include(LLImageJ2COJ) include(LLInventory) include(LLMath) include(LLMessage) -include(LLPathingLib) +include(LLPhysicsExtensions) include(LLPlugin) include(LLPrimitive) include(LLRender) @@ -52,8 +51,7 @@ include_directories( ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} - ${LLCONVEXDECOMP_INCLUDE_DIRS} - ${LLPATHING_INCLUDE_DIRS} + ${LLPHYSICS_INCLUDE_DIRS} ${FMOD_INCLUDE_DIR} ${LLIMAGE_INCLUDE_DIRS} ${LLKDU_INCLUDE_DIRS} @@ -1776,7 +1774,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARIES} ${LLLOGIN_LIBRARIES} - ${LLCONVEXDECOMP_LIBRARY} + ${LLPHYSICS_LIBRARIES} ${TCMALLOC_LIBRARIES} ) |