diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-31 15:19:49 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-31 15:19:49 -0800 |
| commit | 8adcaa147de9e8dabaf6e64fbd8af0ccc61c4519 (patch) | |
| tree | 18564995b6605716ad7d7385857efb5e31ee933f | |
| parent | d9a0a04af4d48d8f1e8ef6e70d3d0863689071bd (diff) | |
update mac and linux json libs.
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index dc6ccc2817..28e5f23217 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -884,9 +884,9 @@ <key>archive</key> <map> <key>hash</key> - <string>c10c28118c578d0674c1fbe59002d0ab</string> + <string>de8b96120c274e052abb4f692861be46</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-darwin-20101004.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Darwin/installer/jsoncpp-0.5.0-darwin-20110131.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -896,9 +896,9 @@ <key>archive</key> <map> <key>hash</key> - <string>7e6b2fc7ad4e12d94d01cc49c22c6f67</string> + <string>db7826354e60fb4ae14bf40258c088af</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20101013.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Linux/installer/jsoncpp-0.5.0-linux-20110131.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 5d571e734a..d878f70a17 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,9 +14,9 @@ else (STANDALONE) # debug json_vc100_libmt optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt) elseif (LINUX) - set(JSONCPP_LIBRARIES jsoncpp) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) endif (WINDOWS) set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) endif (STANDALONE) |