Snowgobe 1.4.2 to 1.5.0 patch part 1 (no rejects)

2010-10-18 10:25:32 +02:00
parent 8148416f42
commit babc0dc420
15 changed files with 410 additions and 227 deletions
--- 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_vc${MSVC_SUFFIX}d
+      optimized json_vc${MSVC_SUFFIX})
  elseif (DARWIN)
    set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
  elseif (LINUX)