diff --git a/autobuild.xml b/autobuild.xml index 240defbf43..f6d6e40aed 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -855,54 +855,6 @@ - havok - - license - havok-ares - license_file - LICENSES/havok.txt - name - havok - platforms - - darwin - - archive - - hash - 286741271be3dc3473af3044ad6d002e - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok/rev/224189/arch/Darwin/installer/havok-0.1-darwin-20110316.tar.bz2 - - name - darwin - - linux - - archive - - hash - 1b6c85fc7705779cd2c2b02f7437fb24 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok/rev/224189/arch/Linux/installer/havok-0.1-linux-20110316.tar.bz2 - - name - linux - - windows - - archive - - hash - 534c5217692bef44a60a3cf26ccb08d9 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/245961/arch/CYGWIN/installer/havok_source-2011.2-windows-20111130.tar.bz2 - - name - windows - - - jpeglib license @@ -1143,36 +1095,24 @@ - llconvexdecomposition + llphysicsextensions license - llconvexdecomposition + llphysicsextensions license_file - on_file + LICENSES/llphysicsextensions.txt name - llconvexdecomposition + llphysicsextensions platforms - darwin - - archive - - hash - 362654a472ef7368d4c803ae3fb89d95 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110819.tar.bz2 - - name - darwin - linux archive hash - c7801d899daec5338fbe95053255b7e7 + c863c80eb41b330f978a8440a7c16c1b url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110819.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248410/arch/Linux/installer/llphysicsextensions-0.1-linux-20120125.tar.bz2 name linux @@ -1182,93 +1122,9 @@ archive hash - 6ecf2f85f03c5ae87fe45769566a5660 + 7f61547aa706e28504b2bab532f065d9 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110819.tar.bz2 - - name - windows - - - - llconvexdecompositionstub - - license - lgpl - license_file - LICENSES/LLConvexDecompositionStubLicense.txt - name - llconvexdecompositionstub - platforms - - darwin - - archive - - hash - a5f53e09f67271fd50f1131ffdda9d27 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/Darwin/installer/llconvexdecompositionstub-0.3-darwin-20110819.tar.bz2 - - name - darwin - - linux - - archive - - hash - 0006a964f1497f55a5f181b7042d2d22 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/Linux/installer/llconvexdecompositionstub-0.3-linux-20110819.tar.bz2 - - name - linux - - windows - - archive - - hash - b859e7e3bb03ebb467f0309f46422995 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/CYGWIN/installer/llconvexdecompositionstub-0.3-windows-20110819.tar.bz2 - - name - windows - - - - llpathinglib - - license - llpathinglib - license_file - LICENSES/llpathinglib.txt - name - llpathinglib - platforms - - linux - - archive - - hash - 2acaf6db01ba22e12b8e3a66fb4d647b - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248387/arch/Linux/installer/llpathinglibrary-0.1-linux-20120125.tar.bz2 - - name - linux - - windows - - archive - - hash - ff8541aecfcb301d6dcb5f8a59f83a91 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248387/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120125.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248410/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120125.tar.bz2 name windows diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 279d577a27..7fccf3327f 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -42,7 +42,6 @@ set(cmake_SOURCE_FILES LLAudio.cmake LLCharacter.cmake LLCommon.cmake - LLConvexDecomposition.cmake LLCrashLogger.cmake LLDatabase.cmake LLImage.cmake @@ -53,6 +52,7 @@ set(cmake_SOURCE_FILES LLMessage.cmake LLPlugin.cmake LLPrimitive.cmake + LLPhysicsExtensions.cmake LLRender.cmake LLScene.cmake LLTestCommand.cmake diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake deleted file mode 100644 index 1731853300..0000000000 --- a/indra/cmake/LLConvexDecomposition.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) - -# if (INSTALL_PROPRIETARY AND NOT STANDALONE) -# use_prebuilt_binary(llconvexdecomposition) -# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) -# else (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llconvexdecompositionstub) - set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) -# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake deleted file mode 100644 index 8e622d83db..0000000000 --- a/indra/cmake/LLPathingLib.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -use_prebuilt_binary(llpathinglib) -set(LLPATHING_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include) - - -set(LLPATHING_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) -set(LLPATHING_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) - -find_library(LL_PATHING_DEBUG_LIB llpathinglib PATHS ${LLPATHING_DEBUG_LIBRARY_PATH}) -find_library(LL_PATHING_RELEASE_LIB llpathinglib PATHS ${LLPATHING_RELEASE_LIBRARY_PATH}) - -set(LLPATHING_LIBRARIES - - debug ${LL_PATHING_DEBUG_LIB} - optimized ${LL_PATHING_RELEASE_LIB} -) - -if (LINUX) - list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group) - list(APPEND LLPATHING_LIBRARIES -Wl,--end-group) -endif (LINUX) diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake new file mode 100644 index 0000000000..252be44d30 --- /dev/null +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -0,0 +1,31 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(llpysicsextensions) +set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) + +set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) +set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) + +find_library(LL_PHYSICS_DEBUG_LIB llpathinglib PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) +find_library(LL_PHYSICS_RELEASE_LIB llpathinglib PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) + +set(LLPHYSICS_LIBRARIES + + debug ${LL_PHYSICS_DEBUG_LIB} + optimized ${LL_PHYSICS_RELEASE_LIB} +) + +if (LINUX) + list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) +endif (LINUX) + +# if (INSTALL_PROPRIETARY AND NOT STANDALONE) +# use_prebuilt_binary(llconvexdecomposition) +# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) +# else (INSTALL_PROPRIETARY AND NOT STANDALONE) +# use_prebuilt_binary(llconvexdecompositionstub) +# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) +# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) + 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} )