livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update mac and linux json libs.

master
Andrew A. de Laix 2011-01-31 15:19:49 -08:00
parent d9a0a04af4
commit 8adcaa147d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -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>

4
indra/cmake/JsonCpp.cmake
View File

@ -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)