diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2012-07-11 02:13:42 +0000 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2012-07-11 02:13:42 +0000 |
| commit | fda39ea12386467f61c8ee5ec28ca45ec84a19f5 (patch) | |
| tree | 1d31f84303b6106400829c8e5c98f4774413b272 /indra/newview | |
| parent | 34d95fdc01690fe65ac89136cbc4782a9a22af95 (diff) | |
| parent | 14acd7de30e2eb2e7c6c4fe59dd26a4317e99f34 (diff) | |
Merging main havok-development-hkai and oz's havok-development-hkai
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c91d276c8f..b5c64925c6 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -44,6 +44,8 @@ include(VisualLeakDetector) include(GLOD) include(CMakeCopyIfDifferent) +add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) + include_directories( ${DBUSGLIB_INCLUDE_DIRS} ${JSONCPP_INCLUDE_DIR} @@ -58,6 +60,7 @@ include_directories( ${LLINVENTORY_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} + ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS} ${LLPLUGIN_INCLUDE_DIRS} ${LLPRIMITIVE_INCLUDE_DIRS} ${LLRENDER_INCLUDE_DIRS} @@ -1819,6 +1822,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${CRYPTO_LIBRARIES} ${LLLOGIN_LIBRARIES} ${LLPHYSICS_LIBRARIES} + ${LLPHYSICSEXTENSIONS_LIBRARIES} ${TCMALLOC_LIBRARIES} ) |