summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAlain Linden <alain@lindenlab.com>2011-01-31 12:31:36 -0800
committerAlain Linden <alain@lindenlab.com>2011-01-31 12:31:36 -0800
commitf05f2412b2d193b4c767fd30e1e1ef1a3dd404c8 (patch)
tree486db911f3f54053ee348de851b50104f5d034d9 /indra
parent3895be8e25e74abd16a14803c8a0288df7c42a4b (diff)
patches to use new jsoncpp lib on windows
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/JsonCpp.cmake4
1 files changed, 2 insertions, 2 deletions
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)