#3450 vtk9itk5wx3-macos

diff --git a/Install_mingw64/Install_CreaTools/scripts/All2.bat b/Install_mingw64/Install_CreaTools/scripts/All2.bat
index 2d10a27a59eba8149574ed44e6751c988ca7360c..7139a5e66b812ad6e388061dc52b3ddad7452220 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/All2.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/All2.bat
@@ -45,6 +45,8 @@ mkdir c_%buildtype%%platforme%\log
 echo call configure variables
 call %scriptsFolder%\base\configureVariables.bat
 
+set PATH=%DirMingwDlls%;%PATH%
+
 REM goto skypToEED
 REM :skypToEED
 

diff --git a/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
index a231bfabc6ec5ea59ce04159360aa5635a59c040..f026a6419b5df6080761361db1435ebdde947b70 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
@@ -66,8 +66,8 @@ REM msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Config
 ::msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 INSTALL.vcxproj
 ::msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 PACKAGE.vcxproj
 
-mingw32-make.exe -j%NUMBER_OF_PROCESSORS% 
-mingw32-make.exe install
+%DirMingwDlls%\mingw32-make.exe -j%NUMBER_OF_PROCESSORS% 
+%DirMingwDlls%\mingw32-make.exe install
 
 ::copy %2*.exe %3\c_%buildtype%%platforme%\ri\
 

diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index 1cd476f55c7c21fb210ffffc199762a3dd088ca4..059900a74956c146bf6eddd78d52a0cd5209afa9 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -56,8 +56,8 @@ set ITKFNAME=InsightToolkit-5.0.1-patchCreatis.zip
 
 ::set WXFNAME=wxWidgets-2.8.12.zip
 ::set WXVERSION=2.8.12
-set WXFNAME=wxWidgets-3.0.4.7z
-set WXVERSION=3.0.4
+set WXFNAME=wxWidgets-3.2.1.zip
+set WXVERSION=3.2.1
 
 :: set BOOSTFNAME=boost_1_49_0.7z
 :: set BOOSTFNAME=boost_1_52_0.7z

diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
index f4eb7766b2cd5188308f530a0a4906e772f30101..2ce43b596094bcbb6da4493c754033cd204fe708 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -145,10 +145,10 @@ cd %wxWidgets%Bin
 :: 3.0.4 manual
 :: https://wiki.wxwidgets.org/Compiling_wxWidgets_with_MinGW
 cd %sourcepath%\%wxWidgets%\build\msw                                 
-mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release clean                                    >> %LogFolder%\wxWidgetsInstall.log 2>&1
-mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
-mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
-mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release                                                  >> %LogFolder%\wxWidgetsInstall.log 2>&1
+%DirMingwDlls%\mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release clean                                     >> %LogFolder%\wxWidgetsInstall.log 2>&1
+%DirMingwDlls%\mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
+%DirMingwDlls%\mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
+%DirMingwDlls%\mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release                                                   >> %LogFolder%\wxWidgetsInstall.log 2>&1
 cd ..\..                                                                           
 mkdir %installpath%                                                                                    >> %LogFolder%\wxWidgetsInstall.log 2>&1
 mkdir %installpath%\lib                                                                                >> %LogFolder%\wxWidgetsInstall.log 2>&1

diff --git a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
index e8c2cdb3f21cbefc87fd29759f1e9d49a4a403c9..1ce5ffd9c22cdb78357eb23873392d131e7a2d3c 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
@@ -1,11 +1,11 @@
 
-set  EEDclean=FALSE
+set  EEDclean=TRUE
 set  EEDcleanSOURCES=TRUE
 set  EEDcleanBIN=TRUE
 set  EEDcleanINSTALL=TRUE
 set  EEDcleanLOGS=TRUE
 
-set  EEDdownload=FALSE
+set  EEDdownload=TRUE
 set  EEDdownloadQT=FALSE
 set  EEDdownloadWXWINDOWS=TRUE
 set  EEDdownloadBOOST=TRUE
@@ -18,7 +18,7 @@ set  EEDdownloadDLFCN=TRUE
 set  EEDdownloadTTH=TRUE
 set  EEDdownloadOPENGLMESA=TRUE
 
-set  EEDinstall=FALSE
+set  EEDinstall=TRUE
 set  EEDinstallQT=FALSE
 set  EEDinstallWXWIDGETS=TRUE
 set  EEDinstallBOOST=TRUE

diff --git a/Install_mingw64/config_win.bat b/Install_mingw64/config_win.bat
index bca0364a752e5e2195ddcee7e6335137d626527f..dc013ef7445e7186e551de4a7fe03b57c4aa4364 100644 (file)
--- a/Install_mingw64/config_win.bat
+++ b/Install_mingw64/config_win.bat
@@ -7,7 +7,9 @@ set ProgramFiles=C:\Program Files (x86)
 set wgetPath="C:\Users\davila\Creatis\crea_Developper_Tools\wget\wget.exe"
 set zipPath="C:\Program Files\7-Zip\7z.exe"
 ::set zipPath="peazip -ext2here "
-set DirMingwDlls=C:\Users\davila\Creatis\ups\mingw64\bin
+
+:set DirMingwDlls=C:\Users\davila\Creatis\ups\mingw64\bin
+set DirMingwDlls=C:\Users\davila\Creatis\ups\mingw64-8.5-posix\bin
 ::set DirMingwDlls=C:\Users\davila\Creatis\crea_Developper_Tools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin