# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1523990527 -7200
# Node ID d5ca5a5abe127ac19de927e9b29dd93c768e8384
# Parent  6c72ef308cb340fbc602d7af79121f109224d474# Parent  83489e20ad0c26b42abef37883ac4f3bdd69c242
merge

diff -r 6c72ef308cb3 -r d5ca5a5abe12 .travis.yml
--- a/.travis.yml	Tue Apr 17 20:41:49 2018 +0200
+++ b/.travis.yml	Tue Apr 17 20:42:07 2018 +0200
@@ -48,7 +48,7 @@
     ..; fi
   - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then cmake
     -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON
-    -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake -DUSE_DCMTK_360=ON
+    -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake -DUSE_DCMTK_360=ON -DUSE_LEGACY_JSONCPP=ON
     ..; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then cmake 
     -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON
diff -r 6c72ef308cb3 -r d5ca5a5abe12 INSTALL
--- a/INSTALL	Tue Apr 17 20:41:49 2018 +0200
+++ b/INSTALL	Tue Apr 17 20:42:07 2018 +0200
@@ -99,7 +99,7 @@
 the following command:
 
 # cd ~/OrthancBuild
-# cmake -DCMAKE_TOOLCHAIN_FILE=~/Orthanc/Resources/MinGWToolchain.cmake -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DCMAKE_BUILD_TYPE=Debug ~/Orthanc
+# cmake -DCMAKE_TOOLCHAIN_FILE=~/Orthanc/Resources/MinGW-W64-Toolchain32.cmake -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DUSE_DCMTK_360=ON -DUSE_LEGACY_JSONCPP=ON ~/Orthanc
 # make