merge latest fix from nat

2014-12-12 18:21:37 -05:00 · 2014-12-12 18:21:37 -05:00 · eb5c0dd32a
parent 282d8c4c45 f7d1ece5be
commit eb5c0dd32a
1 changed files with 2 additions and 2 deletions
--- 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_vc100debug_libmt.lib
-      optimized json_vc100_libmt)
+      debug json_libmtd.lib
+      optimized json_libmt)
  elseif (DARWIN)
    set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
  elseif (LINUX)