From 72588f99dd8457d26114fe60a5239d4d10e468cb Mon Sep 17 00:00:00 2001 From: Eduardo Enrique Davila Serrano Date: Fri, 7 Oct 2022 14:08:44 +0200 Subject: [PATCH] #3450 vtk9itk5wx3-macos --- Install_mingw64/Install_CreaTools/scripts/All2.bat | 2 ++ .../Install_CreaTools/scripts/base/compilemod.bat | 4 ++-- .../Install_ThirdParty/scripts/download_ThirdPartySW.bat | 4 ++-- .../Install_ThirdParty/scripts/install_thirdparty_all.bat | 8 ++++---- .../Install_ThirdParty/scripts/tpl_variables.bat | 6 +++--- Install_mingw64/config_win.bat | 4 +++- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Install_mingw64/Install_CreaTools/scripts/All2.bat b/Install_mingw64/Install_CreaTools/scripts/All2.bat index 2d10a27..7139a5e 100644 --- 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 a231bfa..f026a64 100644 --- 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 1cd476f..059900a 100644 --- 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 f4eb776..2ce43b5 100644 --- 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 e8c2cdb..1ce5ffd 100644 --- 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 bca0364..dc013ef 100644 --- 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 -- 2.45.1