diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-01-31 12:31:36 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-01-31 12:31:36 -0800 |
| commit | f05f2412b2d193b4c767fd30e1e1ef1a3dd404c8 (patch) | |
| tree | 486db911f3f54053ee348de851b50104f5d034d9 | |
| parent | 3895be8e25e74abd16a14803c8a0288df7c42a4b (diff) | |
patches to use new jsoncpp lib on windows
| -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 25c598362c..dc6ccc2817 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -704,9 +704,9 @@ <key>archive</key> <map> <key>hash</key> - <string>506c870d37b3f7696171e4180c8bf821</string> + <string>320972cefe728e668b0dc6356eeda58f</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-windows-20110119.tar.bz2</string> + <string>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/google_breakpad-0.0.0-rev599-windows-20110128.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -908,9 +908,9 @@ <key>archive</key> <map> <key>hash</key> - <string>ac06a8981cf7df3522362850ffb3a531</string> + <string>53f1e3ff386daa25ff1e88df4b5c6941</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-windows-20101011.tar.bz2</string> + <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 7dd565be7c..5d571e734a 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -11,8 +11,8 @@ else (STANDALONE) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES - debug json_vc80d - optimized json_vc80) +# debug json_vc100_libmt + optimized json_vc100_libmt) elseif (DARWIN) set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt) elseif (LINUX) |