diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-06-24 16:45:47 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-06-24 16:45:47 -0700 |
| commit | 3827b395fbca941846dab494ee8449786a39561d (patch) | |
| tree | b4c638de1a0dedcf17486c20576ae6d8016e5364 | |
| parent | 66e353812f4732c77206322d271b2346dd74feec (diff) | |
Fixed cmake to grab the decomposition libraries.
| -rw-r--r-- | indra/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | install.xml | 26 |
3 files changed, 30 insertions, 4 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 8612c46376..cadd2608e2 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -42,7 +42,7 @@ set(cmake_SOURCE_FILES LLAudio.cmake LLCharacter.cmake LLCommon.cmake - LLConvexDecompInter.cmake + LLConvexDecomposition.cmake LLCrashLogger.cmake LLDatabase.cmake LLImage.cmake diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f0b58b385c..45291e60f9 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -16,7 +16,7 @@ include(FindOpenGL) include(LLAudio) include(LLCharacter) include(LLCommon) -include(LLConvexDecompInter) +include(LLConvexDecomposition) include(LLImage) include(LLImageJ2COJ) include(LLInventory) @@ -50,7 +50,7 @@ include_directories( ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} - ${LLCONVEXDECOMPINTER_INCLUDE_DIRS} + ${LLCONVEXDECOMP_INCLUDE_DIRS} ${LLIMAGE_INCLUDE_DIRS} ${LLINVENTORY_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} @@ -1682,7 +1682,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${CRYPTO_LIBRARIES} ${LLLOGIN_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES} - ${LLCONVEXDECOMPINTER_LIBRARIES} + ${LLCONVEXDECOMP_LIBRARY} ) build_version(viewer) diff --git a/install.xml b/install.xml index ae3f930a1d..a944e7709d 100644 --- a/install.xml +++ b/install.xml @@ -1038,6 +1038,32 @@ anguage Infrstructure (CLI) international standard</string> </map> </map> </map> + <key>llconvexdecomposition</key> + <map> + <key>copyright</key> + <string>on file</string> + <key>description</key> + <string>Convex decomposition utility for mesh</string> + <key>license</key> + <string>havok</string> + <key>packages</key> + <map> + <key>windows</key> + <map> + <key>md5sum</key> + <string>9b895f616dfb5ce9814d4e53417950a9</string> + <key>url</key> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.1-windows-20100622.tar.bz2</uri> + </map> + <key>linux</key> + <map> + <key>md5sum</key> + <string>da4d464008fac288865f259873cafad2</string> + <key>url</key> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.1-linux-20100622.tar.bz2</uri> + </map> + </map> + </map> <key>llqtwebkit</key> <map> <key>license</key> |