From 84df608ade855c9ee4e76b78a8345b7f7ad08db3 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 5 Apr 2011 14:11:28 -0400 Subject: initial pass at adding new mesh libraries to autobuild. Needs a license review and some other fixes, but autobuild configure completes successfully. --- autobuild.xml | 372 ++++++++++++++++++++++++++++++-------- indra/cmake/GooglePerfTools.cmake | 2 +- indra/newview/CMakeLists.txt | 1 - 3 files changed, 295 insertions(+), 80 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4951be63bc..ec5d7d51ac 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -51,6 +51,54 @@ + GLOD + + license + GLOD + license_file + LICENSES/glod.txt + name + GLOD + platforms + + darwin + + archive + + hash + 3a7263246813ecf9aff5a240892f9641 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20101007a.tar.bz2 + + name + darwin + + linux + + archive + + hash + ca7368e9a1baf266b82d910fa8f821bd + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-linux-20100920a.tar.bz2 + + name + linux + + windows + + archive + + hash + e40e1eac81dc57d8724f96fd977a3d58 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-windows-20110330.tar.bz2 + + name + windows + + + SDL license @@ -219,6 +267,54 @@ + colladadom + + license + scea + license_file + LICENSES/scea.txt + name + colladadom + platforms + + darwin + + archive + + hash + 86de85fa85aa58b5ee550a6a3c77a7d3 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-darwin-20101117.tar.bz2 + + name + darwin + + linux + + archive + + hash + e515afc3fa4dcb00d9fb06fbb6343669 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-linux-20101102.tar.bz2 + + name + linux + + windows + + archive + + hash + c1e79c9d3084727be35ce140db87717e + url + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/colladadom-2.1-windows-20110223.tar.bz2 + + name + windows + + + curl license @@ -615,42 +711,6 @@ - google-perftools - - license - bsd - license_file - LICENSES/google-perftools.txt - name - google-perftools - platforms - - linux - - archive - - hash - cf513fc2eec4a414cc804cf408932a45 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2 - - name - linux - - windows - - archive - - hash - 8108bffe1c814be9d035b47dac3d4541 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-perftools-1.0-windows-20101001b.tar.bz2 - - name - windows - - - google_breakpad license @@ -1047,6 +1107,102 @@ + llconvexdecomposition + + license + havok + license_file + on_file + name + llconvexdecomposition + platforms + + darwin + + archive + + hash + 47ef880db4aea1a9561194c54fc28433 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-darwin-20101222.tar.bz2 + + name + darwin + + linux + + archive + + hash + f63424076d4fadd133950af0cf9c3564 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-linux-20101222.tar.bz2 + + name + linux + + windows + + archive + + hash + 5ae8bab01189c5dbbc6f383c751e031a + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-windows-20101222.tar.bz2 + + name + windows + + + + llconvexdecompositionstub + + license + lgpl + license_file + LICENSES/lgpl.txt + name + llconvexdecompositionstub + platforms + + darwin + + archive + + hash + 349fa0e287fb275bbee43ced194a1db1 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz2 + + name + darwin + + linux + + archive + + hash + dbf4b15e74ce9042e8500720dffc461a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-linux-20101015a.tar.bz2 + + name + linux + + windows + + archive + + hash + bba9a4dd04fda1b263f34448a044783b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-windows-20101015.tar.bz2 + + name + windows + + + llqtwebkit license @@ -1351,6 +1507,42 @@ + pcre + + license + bsd + license_file + LICENSES/bsd.txt + name + pcre + platforms + + darwin + + archive + + hash + ef430ae3b9cdba518ad9952e99b12367 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pcre-7.6-darwin-20101102.tar.bz2 + + name + darwin + + linux + + archive + + hash + 86195b0680604fe86cfbbfb921c31dff + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pcre-7.6-linux-20101029.tar.bz2 + + name + linux + + + pth license @@ -1447,6 +1639,42 @@ + tcmalloc + + license + bsd + license_file + LICENSES/google-perftools.txt + name + google-perftools + platforms + + linux + + archive + + hash + cf513fc2eec4a414cc804cf408932a45 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2 + + name + linux + + windows + + archive + + hash + 8108bffe1c814be9d035b47dac3d4541 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-perftools-1.0-windows-20101001b.tar.bz2 + + name + windows + + + tut license @@ -1740,8 +1968,7 @@ name Release - - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo configure @@ -1760,11 +1987,9 @@ name - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo - - - VC10msbuildRelWithDebInfo + VC10msbuildRelease configure @@ -1776,18 +2001,16 @@ cmake options - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DCMAKE_BUILD_TYPE:STRING=Release -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife name - VC10msbuildRelWithDebInfo + VC10msbuildRelease - - - VC10msbuildRelease + VCexpressRelWithDebInfo configure @@ -1799,16 +2022,15 @@ cmake options - -DCMAKE_BUILD_TYPE:STRING=Release + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife name - VC10msbuildRelease + VCexpressRelWithDebInfo - name common @@ -2752,21 +2974,21 @@ name Release - - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo build - arguments - - "RelWithDebInfo|Win32" - command - vcbuild.exe + msbuild.exe options - /u SecondLife.sln + /verbosity:minimal + /t:build + /p:Configuration=RelWithDebInfo + /p:Platform=Win32 + /p:"VCBuildAdditionalOptions= /useenv" + /p:"VCBuildAdditionalOptions= /incremental" configure @@ -2781,11 +3003,9 @@ name - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo - - - VC10msbuildRelWithDebInfo + VC10msbuildRelease build @@ -2794,13 +3014,12 @@ options SecondLife.sln - /verbosity:minimal /t:build - /p:Configuration=RelWithDebInfo + /p:Configuration=Release /p:Platform=Win32 /p:"VCBuildAdditionalOptions= /useenv" /p:"VCBuildAdditionalOptions= /incremental" - + configure @@ -2814,25 +3033,23 @@ name - VC10msbuildRelWithDebInfo + VC10msbuildRelease - - - VC10msbuildRelease + VCexpressRelWithDebInfo build + arguments + + "RelWithDebInfo|Win32" + command - msbuild.exe + vcbuild.exe options + /u SecondLife.sln - /t:build - /p:Configuration=Release - /p:Platform=Win32 - /p:"VCBuildAdditionalOptions= /useenv" - /p:"VCBuildAdditionalOptions= /incremental" - + configure @@ -2846,9 +3063,8 @@ name - VC10msbuildRelease + VCexpressRelWithDebInfo - name windows diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index c401245043..5f653c8fb3 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -12,7 +12,7 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) - use_prebuilt_binary(google-perftools) + use_prebuilt_binary(tcmalloc) set(TCMALLOC_LIBRARIES tcmalloc_minimal) set(PROFILER_LIBRARIES profiler) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 6b3b1c4bb0..73b4d41895 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1462,7 +1462,6 @@ if (WINDOWS) LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\"" LINK_FLAGS_RELEASE ${release_flags} ) - LINK_FLAGS_RELEASE "" set_target_properties(${VIEWER_BINARY_NAME} PROPERTIES LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /INCLUDE:__tcmalloc" -- cgit v1.2.3