diff --git a/autobuild.xml b/autobuild.xml index f483bfc940..52a76ea9db 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -18,9 +18,9 @@ archive hash - e6071abd822c0688390382a26f8a782c + afd8e4cb38ba4b704edb857188491fa5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/267984/arch/Darwin/installer/glod-1.0pre4-darwin-20121211.tar.bz2 + http://downloads.phoenixviewer.com/glod-1.0pre4-darwin-20131029u.tar.bz2 name darwin @@ -182,9 +182,9 @@ archive hash - e6caaeea16131e1f2343ecd7765e3147 + 5c588beb693030f321dcf23d06ed934a url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20110217.tar.bz2 + http://downloads.phoenixviewer.com/ares-1.7.5-darwin-20131027u.tar.bz2 name darwin @@ -494,9 +494,9 @@ archive hash - 180e03d0be1f1acfc3244e78742d7bef + b3a3849d44710ade63e8951c936ca829 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-expat/rev/221695/arch/Darwin/installer/expat-2.0.1-darwin-20110218.tar.bz2 + http://downloads.phoenixviewer.com/expat-2.0.1-darwin-20131028u.tar.bz2 name darwin @@ -770,9 +770,9 @@ archive hash - bd2f84ef8bd308570e2e532a371dc2ef + fa443c9aa66d13ee833e07287a047527 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-darwin-20110309.tar.bz2 + http://downloads.phoenixviewer.com/glui-2.36-darwin-20131028u.tar.bz2 name darwin @@ -806,9 +806,9 @@ archive hash - aff5566e04003de0383941981198e04e + 544b56abc54a18d4f6cc8ed715d55396 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/Darwin/installer/google_breakpad-0.0.0-rev1099-darwin-20130329.tar.bz2 + http://downloads.phoenixviewer.com/google_breakpad-0.0.0-rev1099-darwin-20131028u.tar.bz2 name darwin @@ -854,9 +854,9 @@ archive hash - 886ee428f058005ab7f90f61784ec9d9 + a50fc6c83159ca5a726f6052a8612c50 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/googlemock-1.1.0-darwin-20101004.tar.bz2 + http://downloads.phoenixviewer.com/gmock-1.6.0-darwin-20131028u.tar.bz2 name darwin @@ -1094,9 +1094,9 @@ archive hash - de8b96120c274e052abb4f692861be46 + d24884f62c3a67cedace4b54edfec939 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-darwin-20110131.tar.bz2 + http://downloads.phoenixviewer.com/jsoncpp-0.5.0-darwin-20131028u.tar.bz2 name darwin @@ -1142,9 +1142,9 @@ archive hash - cf06822fc961c3b66725bd7930292ebf + ff0952c33712212994ffeda118c5c6ef url - file:///opt/firestorm/kdu-7.1-darwin_x86-20121212.tar.bz2 + file:///opt/firestorm/kdu-7.1-darwin_universal-20131111.tar.bz2 name darwin @@ -1190,9 +1190,9 @@ archive hash - 6f5db0ef258df6e5c93c843ec559db6d + 18c4964fea16bdc3f656d217a726ad9c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-hunspell/rev/259874/arch/Darwin/installer/libhunspell-1.3.2-darwin-20120616.tar.bz2 + http://downloads.phoenixviewer.com/libhunspell-1.3.2-darwin-20131028u.tar.bz2 name darwin @@ -1532,9 +1532,9 @@ archive hash - eb35e0da356163387272167bd81771f4 + eca7d927bef09da2686d60feaf155930 url - http://phoenixviewer.com/app/packages/ndPhysicsStub-0.1.1-Darwin_ao10.5.tar.bz2 + http://downloads.phoenixviewer.com/ndPhysicsStub-0.1.1-darwin-20131109u.tar.bz2 name darwin @@ -1580,9 +1580,9 @@ archive hash - 674d37d2ba76a2df7f18c47bf50b5d03 + 5c59b494033ed0e052935dca3120bb15 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libndofdev-0.1-darwin-20110308.tar.bz2 + http://downloads.phoenixviewer.com/libndofdev-0.1-darwin-20131028u.tar.bz2 name darwin @@ -1700,9 +1700,9 @@ archive hash - facee34b8bd57ad602157e65a5af1a49 + 694e9f09144d96d480526574d83b4d67 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openssl-0.9.8q-darwin-20110211.tar.bz2 + http://downloads.phoenixviewer.com/openssl-1.0.0g-darwin-20131028u.tar.bz2 name darwin @@ -1836,9 +1836,9 @@ archive hash - a8e74694a0f4248228c13c845ed0a6f8 + 1c38f1cc4eafca2959ff56b7d1dbf79e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-pcre/rev/228822/arch/Darwin/installer/pcre-7.6-darwin-20110504.tar.bz2 + http://downloads.phoenixviewer.com/pcre-8.32-darwin-20131110u.tar.bz2 name darwin @@ -1968,9 +1968,9 @@ archive hash - a3e0fb4b4a51b01690a99747a1cca531 + 3f268f06de51082e18aa6f7b16026c24 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc_epi-0.54.1-darwin-20110307.tar.bz2 + http://downloads.phoenixviewer.com/xmlrpc_epi-0.54.1-darwin-20131028u.tar.bz2 name darwin @@ -2016,9 +2016,9 @@ archive hash - 49b8de20f3bb43537f51311894a72de1 + ff0a653d6d3ad99523ad6e478691532b url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.5-darwin-20110211.tar.bz2 + http://downloads.phoenixviewer.com/zlib-1.2.6-darwin-20131028u.tar.bz2 name darwin diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 7ad73e5683..51c5ba2d78 100755 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,7 +14,7 @@ else (STANDALONE) debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) + set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) elseif (LINUX) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS)