# HG changeset patch # User Sebastien Jodogne # Date 1523980946 -7200 # Node ID 83489e20ad0c26b42abef37883ac4f3bdd69c242 # Parent 4ff979cf676e6c2e1ed51775d3d73a66f1897bbc mingw diff -r 4ff979cf676e -r 83489e20ad0c .travis.yml --- a/.travis.yml Tue Apr 17 17:33:54 2018 +0200 +++ b/.travis.yml Tue Apr 17 18:02:26 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 4ff979cf676e -r 83489e20ad0c INSTALL --- a/INSTALL Tue Apr 17 17:33:54 2018 +0200 +++ b/INSTALL Tue Apr 17 18:02:26 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