diff options
| author | callum_linden <none@none> | 2014-12-17 19:29:30 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-12-17 19:29:30 -0800 |
| commit | df5006eac948fff1104a15b8fa09f4ab53501ca2 (patch) | |
| tree | 71a3538e5d049286057ef454cd744e5b962291b6 | |
| parent | b265b899d4b0c936eb70f62a165ef176ceb75767 (diff) | |
Update autobuild to point to new version of jsoncpp and change lib names to match those in package
| -rwxr-xr-x | autobuild.xml | 6 | ||||
| -rwxr-xr-x | indra/cmake/JsonCpp.cmake | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/autobuild.xml b/autobuild.xml index 24c020b08a..eb236c0f0e 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -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> diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index bf2d470269..079619adf8 100755 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -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) |