diff --git a/autobuild.xml b/autobuild.xml index 6e7391e110..c7a02fcbb1 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -37,6 +37,18 @@ name linux + linux64 + + archive + + hash + f787b5b8e4b7fcba36602565cc5d8fe0 + url + http://downloads.firestormviewer.org/installables/glod-1.0pre4-linux-x64-20131227.tar.bz2 + + name + linux64 + windows archive @@ -117,6 +129,18 @@ name linux + linux64 + + archive + + hash + 4551308262b8d24f6d8dab7d8d690d5d + url + http://downloads.firestormviewer.org/installables/SDL-1.2.14-linux-x64-20131228.tar.bz2 + + name + linux64 + apr_suite @@ -153,6 +177,18 @@ name linux + linux64 + + archive + + hash + 16d9fbbc89d821d19a2fb2ed96b61913 + url + http://downloads.firestormviewer.org/installables/apr_suite-1.4.5-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -201,6 +237,18 @@ name linux + linux64 + + archive + + hash + 691aa373708bdf72b1153893f7578dd8 + url + http://downloads.firestormviewer.org/installables/ares-1.10.0-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -249,6 +297,18 @@ name linux + linux64 + + archive + + hash + 01a37a2400190d73638ec404d3aef065 + url + http://downloads.firestormviewer.org/installables/boost-1.52.0-linux-x64-20131214.tar.bz2 + + name + linux64 + windows archive @@ -297,6 +357,18 @@ name linux + linux64 + + archive + + hash + 7553b62c7ca7df04fa25fb70430c79d6 + url + http://downloads.firestormviewer.org/installables/colladadom-2.2-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -345,6 +417,18 @@ name linux + linux64 + + archive + + hash + e381b2c553d338c97266b98362160051 + url + http://downloads.firestormviewer.org/installables/curl-7.24.0-linux-x64-20131214.tar.bz2 + + name + linux64 + windows archive @@ -381,6 +465,18 @@ name linux + linux64 + + archive + + hash + 5590bab38ac57703252e3d425739fc2f + url + http://downloads.firestormviewer.org/installables/db-5.1.25-linux-x64-20131215.tar.bz2 + + name + linux64 + dbusglib @@ -405,6 +501,18 @@ name linux + linux64 + + archive + + hash + 02cf031da2eaa733d4458840e9513e88 + url + http://downloads.firestormviewer.org/installables/dbus_glib-0.76-linux-x64-20131215.tar.bz2 + + name + linux64 + dictionaries @@ -441,6 +549,18 @@ name linux + linux64 + + archive + + hash + d1fcbdd80e8748455ba528cbf0514801 + url + http://downloads.firestormviewer.org/installables/dictionaries-1-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -477,6 +597,18 @@ name linux + linux64 + + archive + + hash + 3c0c51c249d0e0320c576ba19e4424bf + url + http://downloads.firestormviewer.org/installables/elfio-1.0.3-linux-x64-20131215.tar.bz2 + + name + linux64 + expat @@ -513,6 +645,18 @@ name linux + linux64 + + archive + + hash + 419103d87bf383fc4e24f6d7a17dc957 + url + http://downloads.firestormviewer.org/installables/expat-2.0.1-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -561,6 +705,18 @@ name linux + linux64 + + archive + + hash + 49703ed28482530ee958c233efea2c04 + url + file:///opt/firestorm/fmodex-4.44.32-linux-x64-20140410.tar.bz2 + + name + linux64 + windows archive @@ -597,6 +753,18 @@ name linux + linux64 + + archive + + hash + cde73209ae2a74d1fa2dcc4b70db6e67 + url + http://downloads.firestormviewer.org/installables/fontconfig-2.8.0-linux-x64-20131216.tar.bz2 + + name + linux64 + freeglut @@ -657,6 +825,18 @@ name linux + linux64 + + archive + + hash + 6f59fd0dc976a12f3053d0ea8371438e + url + http://downloads.firestormviewer.org/installables/freetype-2.4.11-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -693,6 +873,18 @@ name linux + linux64 + + archive + + hash + ea2524f19d53c12645413543930731b0 + url + http://downloads.firestormviewer.org/installables/glext-68-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -741,6 +933,18 @@ name linux + linux64 + + archive + + hash + 31211ab614a1b8f634615194ab7f2360 + url + http://downloads.firestormviewer.org/installables/glh_linear-0.0.0-linux-x64-20131213.tar.bz2 + + name + linux64 + windows archive @@ -825,6 +1029,18 @@ name linux + linux64 + + archive + + hash + b497e91203227c236f291c8cc83a5076 + url + http://downloads.firestormviewer.org/installables/google_breakpad-0.0.0-rev1099-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -873,6 +1089,18 @@ name linux + linux64 + + archive + + hash + 8aae0c236af596e794fe009f344b3d3b + url + http://downloads.firestormviewer.org/installables/gmock-1.6.0-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -909,6 +1137,18 @@ name linux + linux64 + + archive + + hash + cac55fe6c0069fd8209ab48a6c8372c2 + url + http://downloads.firestormviewer.org/installables/gperftools-2.0-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -945,6 +1185,18 @@ name linux + linux64 + + archive + + hash + 9ffe8e4a52f425fc951200e8689b5cdf + url + http://downloads.firestormviewer.org/installables/gstreamer-0.10.28-linux-x64-20131223.tar.bz2 + + name + linux64 + gtk-atk-pango-glib @@ -969,6 +1221,18 @@ name linux + linux64 + + archive + + hash + 0c5990879c99cb5aad9c89862c8c2203 + url + http://downloads.firestormviewer.org/installables/gtk-atk-pango-glib-linux-x64-20131223.tar.bz2 + + name + linux64 + windows archive @@ -1065,6 +1329,18 @@ name linux + linux64 + + archive + + hash + cbf3fde6c5a9567813c591d399e69f11 + url + http://downloads.firestormviewer.org/installables/jpeglib-8c-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -1113,6 +1389,18 @@ name linux + linux64 + + archive + + hash + 4e56cf7e6dafcd124c09d70c7ab47cd2 + url + http://downloads.firestormviewer.org/installables/jsoncpp-0.5.0-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -1161,6 +1449,18 @@ name linux + linux64 + + archive + + hash + 03350c4f0aa32e56bba4979b598a6fc2 + url + file:///opt/firestorm/kdu-7.3.2-linux-20131204.tar.bz2 + + name + linux64 + windows archive @@ -1257,6 +1557,18 @@ name linux + linux64 + + archive + + hash + 0b4442ab57af206253c47876a0220c63 + url + http://downloads.firestormviewer.org/installables/libhunspell-1.3.2-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -1305,6 +1617,18 @@ name linux + linux64 + + archive + + hash + 1501c09ebcaf6a97ac9d5d4933e750e0 + url + http://downloads.firestormviewer.org/installables/libpng-1.5.1-linux-x64-20131220.tar.bz2 + + name + linux64 + windows archive @@ -1341,6 +1665,18 @@ name linux + linux64 + + archive + + hash + 4729178d1d0bdc9c7d1d1c66712e9646 + url + http://downloads.firestormviewer.org/installables/uuid-1.6.2-linux-x64-20131215.tar.bz2 + + name + linux64 + libxml @@ -1365,6 +1701,18 @@ name linux + linux64 + + archive + + hash + 819bf22602afa1fbbfef3bb067d21069 + url + http://downloads.firestormviewer.org/installables/libxml2-2.7.8-linux-x64-20131212.tar.bz2 + + name + linux64 + llappearanceutility-source @@ -1531,6 +1879,18 @@ name linux + linux64 + + archive + + hash + fcd1bf2c028592c91a6f28e7238fd0c1 + url + http://downloads.firestormviewer.org/installables/llqtwebkit-4.7.1-linux-x64-20131227.tar.bz2 + + name + linux64 + windows archive @@ -1603,6 +1963,18 @@ name linux + linux64 + + archive + + hash + 351ebe8e638cea6f6c3dd85dd0b5b00c + url + http://downloads.firestormviewer.org/installables/ndPhysicsStub-1.0-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -1651,6 +2023,18 @@ name linux + linux64 + + archive + + hash + 016f6f2fa3dcc616f67749f2bf0ef201 + url + http://downloads.firestormviewer.org/installables/libndofdev-0.3-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -1723,6 +2107,18 @@ name linux + linux64 + + archive + + hash + 7af891ac1fb52d0c43b0a466d1d2b2d5 + url + http://downloads.firestormviewer.org/installables/ogg_vorbis-1.2.2-1.3.2-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -1771,6 +2167,18 @@ name linux + linux64 + + archive + + hash + 0b26c12dd20aa928453ee18f4793a2dd + url + http://downloads.firestormviewer.org/installables/openssl-1.0.1g-linux-x64-20140417.tar.bz2 + + name + linux64 + windows archive @@ -1809,6 +2217,18 @@ name linux + linux64 + + archive + + hash + bcb331520266fbb2b581aaf7d0d8e9fa + url + http://downloads.firestormviewer.org/installables/openal-1.12.854-1.1.0-linux-x64-20131215.tar.bz2 + + name + linux64 + windows archive @@ -1859,6 +2279,18 @@ name linux + linux64 + + archive + + hash + 6ac7d355ad071e9dca55b403397c3ff9 + url + http://downloads.firestormviewer.org/installables/openjpeg-1.4-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -1907,6 +2339,18 @@ name linux + linux64 + + archive + + hash + c31f766db43797f9e95995819ebc36e6 + url + http://downloads.firestormviewer.org/installables/pcre-8.32-linux-x64-20131212.tar.bz2 + + name + linux64 + quicktime @@ -1987,6 +2431,18 @@ name linux + linux64 + + archive + + hash + 957773fff7148ffaca42b1ea4a18d192 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/270512/arch/Linux/installer/slvoice-4.5.0009.17865-linux-20130216.tar.bz2 + + name + linux64 + windows archive @@ -2023,6 +2479,18 @@ name common + linux64 + + archive + + hash + 130be9c2677de96b1013cde9b0920b06 + url + http://downloads.firestormviewer.org/installables/tut-2008-11-30-linux-x64-20131212.tar.bz2 + + name + linux64 + wix @@ -2079,6 +2547,18 @@ name linux + linux64 + + archive + + hash + 7c5937ee2795f27a27dba687cc9305ee + url + http://downloads.firestormviewer.org/installables/xmlrpc_epi-0.54.1-linux-x64-20131212.tar.bz2 + + name + linux64 + windows archive @@ -2127,6 +2607,18 @@ name linux + linux64 + + archive + + hash + 2907cfba7436c417aeeb89fe94acee02 + url + http://downloads.firestormviewer.org/installables/zlib-1.2.6-linux-x64-20131216.tar.bz2 + + name + linux64 + windows archive diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index ac0cbde253..e59d1cae45 100755 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -30,14 +30,26 @@ macro (use_prebuilt_binary _binary) endif("${${_binary}_installed}" STREQUAL "" AND EXISTS "${CMAKE_BINARY_DIR}/temp/${_binary}_installed") if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0) + if (ND_BUILD64BIT_ARCH) + if (LINUX) + set(autobuild_install_platform "--platform=linux64") + endif (LINUX) + if (DARWIN) + set(autobuild_install_platform "") + endif (DARWIN) + if (WINDOWS) + set(autobuild_install_platform "") + endif (WINDOWS) + endif (ND_BUILD64BIT_ARCH) if(DEBUG_PREBUILT) - message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install + message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install ${autobuild_install_platform} --install-dir=${AUTOBUILD_INSTALL_DIR} --skip-license-check ${_binary} ") endif(DEBUG_PREBUILT) execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" install + ${autobuild_install_platform} --install-dir=${AUTOBUILD_INSTALL_DIR} --skip-license-check ${_binary}