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

Update autobuild to point to new version of jsoncpp and change lib names to match those in package

meow-7.2.2
callum_linden 2014-12-17 19:29:30 -08:00
parent b265b899d4
commit df5006eac9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autobuild.xml
View File

@ -1218,16 +1218,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b5803620f7bf79460145020ce38c7d87</string>
<string>e5a832cffe307a1e814ca0664be30b10</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297281/arch/CYGWIN/installer/jsoncpp-0.5.0.297281-windows-297281.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297580/arch/CYGWIN/installer/jsoncpp-0.5.0.297580-windows-297580.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
<string>0.5.0.297281</string>
<string>0.5.0.297580</string>
</map>
<key>kdu</key>
<map>

4
indra/cmake/JsonCpp.cmake
View File

@ -11,8 +11,8 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(jsoncpp)
if (WINDOWS)
set(JSONCPP_LIBRARIES
debug json_libmtd.lib
optimized json_libmt)
debug json_libmdd.lib
optimized json_libmd.lib)
elseif (DARWIN)
set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
elseif (LINUX)