From: Eduardo DAVILA Date: Mon, 23 Jul 2018 10:03:08 +0000 (+0200) Subject: 3200 creaToolsTools Feature New Normal branch mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c6d405db80d03faa3a0c852d3dc75d7622263b63;p=creaToolsTools.git 3200 creaToolsTools Feature New Normal branch mingw64 --- diff --git a/Install_mingw64/Install_ThirdParty/install-All.bat b/Install_mingw64/Install_ThirdParty/install-All.bat index 4050de9..1284dc9 100644 --- a/Install_mingw64/Install_ThirdParty/install-All.bat +++ b/Install_mingw64/Install_ThirdParty/install-All.bat @@ -1,9 +1,9 @@ -set thirdpartyGenerationBase=E:\creatis\CreaTools_minwg64\C5\tpl\ +set thirdpartyGenerationBase=E:\creatis\c_mingw\C5\tpl\ -set cmakeBin=E:\creatis\CreaTools_minwg64\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe +set cmakeBin=E:\creatis\c_mingw\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe -set wgetPath="E:\creatis\CreaTools_minwg64\For_mingw64\DeveloperTools\wget-1.19.4-win32\wget.exe" +set wgetPath="E:\creatis\c_mingw\For_mingw64\DeveloperTools\wget-1.19.4-win32\wget.exe" set zipPath="C:\Program Files\7-Zip\7z.exe" ::set zipPath="peazip -ext2here " diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat index cf72494..ba3e2bc 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat @@ -58,7 +58,7 @@ set WXFNAME=wxWidgets-3.1.1.7z set WXVERSION=3.1.1 :: set BOOSTFNAME=boost_1_49_0.7z :: set BOOSTFNAME=boost_1_52_0.7z -set BOOSTFNAME=boost_1_63_0.7z +set BOOSTFNAME=boost_1_64_0.7z ::set XERCESFNAME=xerces-c-3.1.1.zip ::set XERCESFNAME=xerces-c-3.1.4.zip set XERCESFNAME=xerces-c-3.2.1.zip @@ -223,7 +223,7 @@ echo ----------------------------------- cd %sourcepath% rename qt-everywhere-opensource-src-4.8.2 qt rename wxWidgets_%WXVERSION% wxWidgets -rename boost_1_63_0 boost +rename boost_1_64_0 boost rename InsightToolkit-4.12.1 itk rename VTK-8.1.1 vtk rename gdcm13_2018_05_28_vtk8 gdcm13 diff --git a/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat b/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat index 9a39b18..36427b1 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat @@ -37,20 +37,20 @@ call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >> if %EEDinstall%==FALSE GOTO SKIPINSTALL cd %scripts% echo Calling install_thirdparty.bat -start /B /wait install_thirdparty_all.bat %thirdpartyGeneration% %buildType% %forcex86% +call install_thirdparty_all.bat %thirdpartyGeneration% %buildType% %forcex86% :SKIPINSTALL if %EEDinstallerDLL%==FALSE GOTO SKIPINSTALLERDLL echo Calling generateThirdPartydllsExe.bat cd %scripts% -start /B /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86% +call generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86% :SKIPINSTALLERDLL if %EEDinstallerLibraries%==FALSE GOTO SKIPINSTALLERLIBRARIES echo Calling generateThirdPartyLibExe.bat cd %scripts% -start /B /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86% +call generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86% :SKIPINSTALLERLIBRARIES