diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-05 12:16:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-05 12:16:48 -0400 |
| commit | 702e6815ed70cb210dc2a014237e0c15a2a69045 (patch) | |
| tree | e6664c09b57b47c658dc28fc2b14c0a4c5d77700 | |
| parent | 92fb00683594ad83ea36dca6fe4fdafbb778c470 (diff) | |
partial changes for building with the llphysicsextensions source package
| -rw-r--r-- | indra/cmake/LLPhysicsExtensions.cmake | 2 | ||||
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 224d7f9b45..72ac35e02b 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -25,5 +25,3 @@ else (HAVOK) endif (HAVOK) set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/llphysicsextensions) - -add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 7d0e313ff3..e4d9de7eb6 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -7,12 +7,14 @@ include(LLCommon) include(LLMath) include(LLMessage) include(LLXML) +include(LLPhysicsExtensions) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} + ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS} ${LIBS_PREBUILT_DIR}/include/collada ${LIBS_PREBUILT_DIR}/include/collada/1.4 ) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 590973c890..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} |