From 619e0b9a359a0dd340bcb734ff6397b8af976258 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 3 Jul 2012 09:36:38 -0400 Subject: remove some cmake output that is no longer needed --- indra/cmake/Linking.cmake | 3 +-- indra/cmake/ViewerMiscLibs.cmake | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 47f944f9a5..c3e3a80fd0 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -38,9 +38,8 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") # packages/lib/release directory to deal with autobuild packages that don't # provide (e.g.) lib/debug libraries. list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) - message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}, extending AUTOBUILD_LIBS_INSTALL_DIRS") endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") -message(STATUS "For ${CMAKE_BUILD_TYPE}, AUTOBUILD_LIBS_INSTALL_DIRS: ${AUTOBUILD_LIBS_INSTALL_DIRS}") + link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS}) if (LINUX) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index df013b1665..cec7c28733 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -7,10 +7,3 @@ if (NOT STANDALONE) use_prebuilt_binary(fontconfig) endif(NOT STANDALONE) -if(VIEWER AND NOT STANDALONE) - if(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) - message(STATUS "We seem to have an artwork bundle in the tree - brilliant.") - else(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) - message(FATAL_ERROR "Didn't find an artwork bundle - this needs to be downloaded separately and unpacked into this tree. You can probably get it from the same place you got your viewer source. Thanks!") - endif(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) -endif(VIEWER AND NOT STANDALONE) -- cgit v1.2.3 From 14f754f1608a0f8ca62ead485669d88cc651667d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 06:08:34 -0400 Subject: begin integrating building of llphysicsextensions from source here (incomplete) --- autobuild.xml | 98 +++++++++++++++++++++++++++-------- indra/cmake/Havok.cmake | 67 ++++++++++++++++++++++++ indra/cmake/LLPhysicsExtensions.cmake | 38 +++++++------- indra/newview/CMakeLists.txt | 1 + 4 files changed, 163 insertions(+), 41 deletions(-) create mode 100644 indra/cmake/Havok.cmake diff --git a/autobuild.xml b/autobuild.xml index d31235e6d3..e66bfb12ae 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -855,6 +855,54 @@ + havok-source + + license + havok-ares + license_file + LICENSES/havok.txt + name + havok-source + platforms + + darwin + + archive + + hash + b5d4e877d18b6cb03d63a6c2d9db30b3 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/prep_3p-havok-source-vs2010/rev/256766/arch/Darwin/installer/havok_source-2011.3-darwin-20120514.tar.bz2 + + name + darwin + + linux + + archive + + hash + 9f34927ecb175b1d6fa18bd079afeac4 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_vs2010/rev/256766/arch/Linux/installer/havok_source-2011.3-linux-20120514.tar.bz2 + + name + linux + + windows + + archive + + hash + da689c64e71cc9a26e71d376054daab5 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/256766/arch/CYGWIN/installer/havok_source-2011.3-windows-20120514.tar.bz2 + + name + windows + + + jpeglib license @@ -1095,14 +1143,14 @@ - llphysicsextensions + llphysicsextensions_source license - llphysicsextensions + TEMPORARY license_file LICENSES/llphysicsextensions.txt name - llphysicsextensions + llphysicsextensions_source platforms darwin @@ -1110,38 +1158,46 @@ archive hash - 96dba4139682980285103586e3e2b981 + ea98ebb0babcf7018bf5c10996be178a + hash_algorithm + md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260794/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120627.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120704.tar.bz2 name darwin - linux - - archive - - hash - 140b9c68ac84c0e2cf40e22e3c5695f4 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260794/arch/Linux/installer/llphysicsextensions-0.1-linux-20120628.tar.bz2 - - name - linux - - windows + + version + 0.2 + + llphysicsextensions_stub + + license + TEMPORARY + license_file + LICENSES/llphysicsextensions.txt + name + llphysicsextensions_stub + platforms + + darwin archive hash - f1af9983fa482e09a4c4d9b4b1ea6492 + eb016d162ac4714ebdfc3331ce080827 + hash_algorithm + md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260794/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120627.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120704.tar.bz2 name - windows + darwin + version + 0.2 llqtwebkit diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake new file mode 100644 index 0000000000..d3df85fd39 --- /dev/null +++ b/indra/cmake/Havok.cmake @@ -0,0 +1,67 @@ +# -*- cmake -*- + +use_prebuilt_binary(havok-source) +set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source) +list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) + +set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok) +set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) + +set(HAVOK_LIBS + hkBase + hkCompat + hkGeometryUtilities + hkInternal + hkSerialize + hkSceneData + hkpCollide + hkpUtilities + hkpConstraintSolver + hkpDynamics + hkpInternal + hkaiInternal + hkaiPathfinding + hkaiAiPhysicsBridge + hkcdInternal + hkcdCollide + hkpVehicle + hkVisualize + hkaiVisualize + hkgpConvexDecomposition +) + +unset(HK_DEBUG_LIBRARIES) +unset(HK_RELEASE_LIBRARIES) +unset(HK_LIBRARIES) + +foreach(HAVOK_LIB ${HAVOK_LIBS}) + find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) + find_library(HAVOK_RELEASE_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) + + if(LINUX) + set(cmd "mkdir") + set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}") + set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}") + exec_program( ${cmd} ${HAVOK_DEBUG_LIBRARY_PATH} ARGS ${debug_dir} OUTPUT_VARIABLE rv) + exec_program( ${cmd} ${HAVOK_RELEASE_LIBRARY_PATH} ARGS ${release_dir} OUTPUT_VARIABLE rv) + + set(cmd "ar") + set(arg " -xv") + set(arg "${arg} ../lib${HAVOK_LIB}.a") + exec_program( ${cmd} ${debug_dir} ARGS ${arg} OUTPUT_VARIABLE rv) + exec_program( ${cmd} ${release_dir} ARGS ${arg} OUTPUT_VARIABLE rv) + + file(GLOB extracted_debug "${debug_dir}/*.o") + file(GLOB extracted_release "${release_dir}/*.o") + list(APPEND HK_DEBUG_LIBRARIES ${extracted_debug}) + list(APPEND HK_RELEASE_LIBRARIES ${extracted_release}) + list(APPEND HK_LIBRARIES debug ${extracted_debug} + optimized ${extracted_release}) + else(LINUX) + list(APPEND HK_DEBUG_LIBRARIES ${HAVOK_DEBUG_LIB_${HAVOK_LIB}}) + list(APPEND HK_RELEASE_LIBRARIES ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) + list(APPEND HK_LIBRARIES debug ${HAVOK_DEBUG_LIB_${HAVOK_LIB}} + optimized ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) + endif (LINUX) +endforeach(HAVOK_LIB) + diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 73d5dd59cf..c9812d06d6 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,29 +1,27 @@ # -*- cmake -*- include(Prebuilt) -if (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llphysicsextensions) - set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensions) -else (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llphysicsextensionsstub) - set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensionsstub) -endif (INSTALL_PROPRIETARY AND NOT STANDALONE) +# Note that the use_prebuilt_binary macros below do not in fact include binaries; +# the llphysicsextensions_* packages are source only and are built here. +# The source package and the stub package both build libraries of the same name. -set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) +# Using the real wrapper or the stub can be controlled with -DHAVOK:BOOL={ON,OFF} +# the default +if (INSTALL_PROPRIETARY) + set(HAVOK ON CACHE BOOL "Use Havok physics library") +endif (INSTALL_PROPRIETARY) -set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) -set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) +if (HAVOK) + include(Havok) + use_prebuilt_binary(llphysicsextensions_source) + set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src) -find_library(LL_PHYSICS_DEBUG_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) -find_library(LL_PHYSICS_RELEASE_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) +else (HAVOK) + use_prebuilt_binary(llphysicsextensions_stub) + set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub) -set(LLPHYSICS_LIBRARIES +endif (HAVOK) - debug ${LL_PHYSICS_DEBUG_LIB} - optimized ${LL_PHYSICS_RELEASE_LIB} -) +set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/llphysicsextensions) -if (LINUX) - list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) - list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) -endif (LINUX) +add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c91d276c8f..f0045692c4 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -58,6 +58,7 @@ include_directories( ${LLINVENTORY_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} + ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS} ${LLPLUGIN_INCLUDE_DIRS} ${LLPRIMITIVE_INCLUDE_DIRS} ${LLRENDER_INCLUDE_DIRS} -- cgit v1.2.3 From 1cad2d9de2bdb5f7964dde57825d62767403a6fb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 06:33:47 -0400 Subject: update to 20120702 build of havok --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e66bfb12ae..fe8700e64b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -870,9 +870,9 @@ archive hash - b5d4e877d18b6cb03d63a6c2d9db30b3 + 4ceeb68ac59a2b999a069b27020f76d3 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/prep_3p-havok-source-vs2010/rev/256766/arch/Darwin/installer/havok_source-2011.3-darwin-20120514.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261056/arch/Darwin/installer/havok_source-2012.1-darwin-20120702.tar.bz2 name darwin @@ -882,9 +882,9 @@ archive hash - 9f34927ecb175b1d6fa18bd079afeac4 + 0591902d3e7eff848f71915df86d8837 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_vs2010/rev/256766/arch/Linux/installer/havok_source-2011.3-linux-20120514.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261056/arch/Linux/installer/havok_source-2012.1-linux-20120702.tar.bz2 name linux @@ -894,9 +894,9 @@ archive hash - da689c64e71cc9a26e71d376054daab5 + 3a860c548aa311dc4e09d17a3a914a98 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/256766/arch/CYGWIN/installer/havok_source-2011.3-windows-20120514.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261056/arch/CYGWIN/installer/havok_source-2012.1-windows-20120702.tar.bz2 name windows -- cgit v1.2.3 From 21ee5f8d415920827a477ae236f30e7d09dc8e9f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 09:39:21 -0400 Subject: successful build with llphysicsextensions stub --- autobuild.xml | 8 ++++---- indra/cmake/LLPhysicsExtensions.cmake | 2 ++ indra/newview/CMakeLists.txt | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index fe8700e64b..60c7b4c118 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,11 +1158,11 @@ archive hash - ea98ebb0babcf7018bf5c10996be178a + 75b3266c3d51b6ae767158969a20a324 hash_algorithm md5 url - file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120704.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2 name darwin @@ -1186,11 +1186,11 @@ archive hash - eb016d162ac4714ebdfc3331ce080827 + 5e6db8ede04aeda9f508fe31df6500c9 hash_algorithm md5 url - file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120704.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2 name darwin diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index c9812d06d6..224d7f9b45 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -15,10 +15,12 @@ if (HAVOK) include(Havok) use_prebuilt_binary(llphysicsextensions_source) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src) + set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions) else (HAVOK) use_prebuilt_binary(llphysicsextensions_stub) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub) + set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensionsstub) endif (HAVOK) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f0045692c4..590973c890 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1820,6 +1820,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${CRYPTO_LIBRARIES} ${LLLOGIN_LIBRARIES} ${LLPHYSICS_LIBRARIES} + ${LLPHYSICSEXTENSIONS_LIBRARIES} ${TCMALLOC_LIBRARIES} ) -- cgit v1.2.3 From 92fb00683594ad83ea36dca6fe4fdafbb778c470 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 12:16:02 -0400 Subject: update llphysicsextensions source and stub packages --- autobuild.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 60c7b4c118..c95e27403d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,15 +1158,39 @@ archive hash - 75b3266c3d51b6ae767158969a20a324 + e538ad2f2c8cb3eeab8e00be32bd3261 hash_algorithm md5 url - file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2 name darwin + linux + + archive + + hash + 22a9feeada730fd66575f7a3678d6358 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120705.tar.bz2 + + name + linux + + windows + + archive + + hash + d1a6d5fd1bc01f0da22eba5660daa100 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120705.tar.bz2 + + name + windows + version 0.2 @@ -1186,15 +1210,39 @@ archive hash - 5e6db8ede04aeda9f508fe31df6500c9 + a598897c0e79157e4dcbd153556c2879 hash_algorithm md5 url - file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/Darwin/installer/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2 name darwin + linux + + archive + + hash + 928e1ff00189f982d4df8f9183b67a20 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/Linux/installer/llphysicsextensions_stub-0.2-linux-20120705.tar.bz2 + + name + linux + + windows + + archive + + hash + 2c930f2ffc4ed8c622498ebbac05477c + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/CYGWIN/installer/llphysicsextensions_stub-0.2-windows-20120705.tar.bz2 + + name + windows + version 0.2 -- cgit v1.2.3 From 702e6815ed70cb210dc2a014237e0c15a2a69045 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 12:16:48 -0400 Subject: partial changes for building with the llphysicsextensions source package --- indra/cmake/LLPhysicsExtensions.cmake | 2 -- indra/llprimitive/CMakeLists.txt | 2 ++ 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} -- cgit v1.2.3 From 9c4d1c779135fe59fdfe974137cedecd21d3d511 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 9 Jul 2012 12:57:18 -0400 Subject: changes to build real sources (works locally on a Mac) --- autobuild.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c95e27403d..b169f62ebd 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,11 +1158,11 @@ archive hash - e538ad2f2c8cb3eeab8e00be32bd3261 + 8898ec8834b897e2b305f5e36a0cc1f6 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120709.tar.bz2 name darwin @@ -1172,9 +1172,9 @@ archive hash - 22a9feeada730fd66575f7a3678d6358 + 3ee3b8d3a8ff2503bc1df90b34a90a77 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120709.tar.bz2 name linux @@ -1184,9 +1184,9 @@ archive hash - d1a6d5fd1bc01f0da22eba5660daa100 + 5a067fc092bd7c568eb65b52504fea5b url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120709.tar.bz2 name windows @@ -1210,11 +1210,11 @@ archive hash - a598897c0e79157e4dcbd153556c2879 + a77d2704a5332f1d90f7d85789b68c07 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/Darwin/installer/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/Darwin/installer/llphysicsextensions_stub-0.2-darwin-20120709.tar.bz2 name darwin @@ -1224,9 +1224,9 @@ archive hash - 928e1ff00189f982d4df8f9183b67a20 + 52b0b20d66b89db81da8ad19f5164599 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/Linux/installer/llphysicsextensions_stub-0.2-linux-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/Linux/installer/llphysicsextensions_stub-0.2-linux-20120709.tar.bz2 name linux @@ -1236,9 +1236,9 @@ archive hash - 2c930f2ffc4ed8c622498ebbac05477c + 36231aa7b761e6039f9c1c6d005a7984 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/CYGWIN/installer/llphysicsextensions_stub-0.2-windows-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/CYGWIN/installer/llphysicsextensions_stub-0.2-windows-20120709.tar.bz2 name windows -- cgit v1.2.3 From e2dffdb38ee1833ad37728d4b07fd4bc37c9675a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 9 Jul 2012 17:52:53 -0400 Subject: update llphysicsextension-source build to address linux build issue --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index b169f62ebd..4d582e1342 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,11 +1158,11 @@ archive hash - 8898ec8834b897e2b305f5e36a0cc1f6 + cb52304ae7fcc232330f7891a901e658 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120709.tar.bz2 name darwin @@ -1172,9 +1172,9 @@ archive hash - 3ee3b8d3a8ff2503bc1df90b34a90a77 + 26f353bd58bcd921630e03d123273d27 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120709.tar.bz2 name linux @@ -1184,9 +1184,9 @@ archive hash - 5a067fc092bd7c568eb65b52504fea5b + c630a9c0b11639667b5a0b2136a734f7 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120709.tar.bz2 name windows -- cgit v1.2.3 From 82f3ee0b3c4b518fbc1b5bb592bbd6101828ca10 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Jul 2012 09:40:01 -0400 Subject: experimental - try 10.6 SDK and lvmgcc42 on TeamCity --- indra/cmake/Variables.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 4cbf7aa043..56ced20abf 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -101,8 +101,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # To support a different SDK update these Xcode settings: set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") + set(CMAKE_OSX_SYSROOT macosx10.6) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: -- cgit v1.2.3 From 14acd7de30e2eb2e7c6c4fe59dd26a4317e99f34 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Jul 2012 17:44:55 -0400 Subject: experimental change for windows debug build --- autobuild.xml | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4d582e1342..cc6e3c710d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,11 +1158,11 @@ archive hash - cb52304ae7fcc232330f7891a901e658 + 5f75735d1092b087b3373ca874c41593 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261490/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120710.tar.bz2 name darwin @@ -1172,9 +1172,9 @@ archive hash - 26f353bd58bcd921630e03d123273d27 + 911f46354e338a7013f023385a3f905f url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261490/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120710.tar.bz2 name linux @@ -1184,9 +1184,9 @@ archive hash - c630a9c0b11639667b5a0b2136a734f7 + b1212ec910042d186836d496d288984c url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261490/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120710.tar.bz2 name windows @@ -1210,39 +1210,15 @@ archive hash - a77d2704a5332f1d90f7d85789b68c07 + d7665ce1324110bdfad0b846e864f6f9 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/Darwin/installer/llphysicsextensions_stub-0.2-darwin-20120709.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120710.tar.bz2 name darwin - linux - - archive - - hash - 52b0b20d66b89db81da8ad19f5164599 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/Linux/installer/llphysicsextensions_stub-0.2-linux-20120709.tar.bz2 - - name - linux - - windows - - archive - - hash - 36231aa7b761e6039f9c1c6d005a7984 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/CYGWIN/installer/llphysicsextensions_stub-0.2-windows-20120709.tar.bz2 - - name - windows - version 0.2 -- cgit v1.2.3