]> Creatis software - creaToolsTools.git/commitdiff
#3200 creaToolsTools Feature New Normal - branch mingw64
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Tue, 7 Aug 2018 10:43:19 +0000 (12:43 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Tue, 7 Aug 2018 10:43:19 +0000 (12:43 +0200)
Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat

index e96c1b01a637e13ca8e028e0f71cb355a5300fe5..ce1d0f211aed5b84c9d95e0d739b17ff97a28803 100644 (file)
@@ -214,14 +214,15 @@ if %EEDdownloadDLFCN%==FALSE GOTO SKIPDOWNLOADDLFCN
   %zipPath% x %DLFCNFNAME%
 ::  del %DLFCNFNAME%
 :SKIPDOWNLOADDLFCN
-
+pause
 if %EEDdownloadOPENGLMESA%==FALSE GOTO SKIPDOWNLOADOPENGLMESA
-  %wgetPath% --no-check-certificate "%urlCreatisSource%/../../crea_Developer_Tools/v4/%OPENGLMESANAME%"
+  %wgetPath% --no-check-certificate "%urlCreatisSource%/../../../crea_Developer_Tools/v4/%OPENGLMESANAME%"
   echo ------------------------------------------------
   echo --------------OPENGL MESA (creatis)------------------
   echo ------------------------------------------------
   cd %sourcepath%
   %zipPath% x %OPENGLMESANAME%
+pause  
 ::  del %OPENGLMESANAME%
 :SKIPDOWNLOADOPENGLMESA
 
index 84896e6491f1f0869342147049f336280ec47794..62191ab079c019b770ef19b806a0eca35b0610a5 100644 (file)
@@ -81,6 +81,6 @@ cd %binpath%
 %cmakeBin% -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt                                        >> %LogFolder%\dlls_cmake.log 2>&1
 mingw32-make.exe package                                                                                                               >> %LogFolder%\dlls_cmake.log 2>&1
 
-move /Y *.exe ..\..\..\
+move /Y *.exe ..\..\..\..\
 
 exit /B
\ No newline at end of file
index 79d4daeef0c9a635053ea13ddad0faaf83a73831..1ce5ffd9c22cdb78357eb23873392d131e7a2d3c 100644 (file)
@@ -1,6 +1,6 @@
 
 set  EEDclean=TRUE
-set  EEDcleanSOURCES=FALSE
+set  EEDcleanSOURCES=TRUE
 set  EEDcleanBIN=TRUE
 set  EEDcleanINSTALL=TRUE
 set  EEDcleanLOGS=TRUE