diff options
| -rw-r--r-- | BuildParams | 4 | ||||
| -rw-r--r-- | autobuild.xml | 5 | ||||
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/BuildParams b/BuildParams index 3f2d74421a..067ce91b8b 100644 --- a/BuildParams +++ b/BuildParams @@ -243,7 +243,7 @@ viewer-vs2010.build_link_parallel = false #============================================================================== # vs2010 debug - for TC debugging only #============================================================================== -viewer-vs2010.build_CYGWIN_Debug = false -viewer-vs2010.build_CYGWIN_Release = false +build_CYGWIN_Debug = false +build_CYGWIN_Release = false # eof diff --git a/autobuild.xml b/autobuild.xml index a6d594a6b5..a090833b51 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -896,9 +896,9 @@ <key>archive</key> <map> <key>hash</key> - <string>db7826354e60fb4ae14bf40258c088af</string> + <string>7e6b2fc7ad4e12d94d01cc49c22c6f67</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Linux/installer/jsoncpp-0.5.0-linux-20110131.tar.bz2</string> + <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20101013.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -1961,6 +1961,7 @@ <array> <string>/build</string> <string>"/cfg=Release|Win32"</string> + <string>"/CL_ADD=/m:1"</string> </array> </map> <key>configure</key> diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 96488360a4..9024fa92a7 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -16,7 +16,7 @@ else (STANDALONE) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) + set(JSONCPP_LIBRARIES libjsoncpp.a) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) + set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE) |