Merge branch 'mingw64' of ssh://git.creatis.insa-lyon.fr/creaToolsTools into mingw64

[creaToolsTools.git] / Install_mingw64 / Install_ThirdParty / scripts / download_ThirdPartySW.bat

diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index 6cd3fcfc2a003cc1ccc9e4c1ae62240cf3c286d3..ba3e2bc81bf755e9d558a727fb3d53e0722868b6 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -22,10 +22,7 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
   echo "Architecture found = x64"
 )
 
-::set zipPath="%ProgramFilesPath_x86%\7-Zip\7z.exe"
-set zipPath="peazip -ext2here "
 ::set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
-set wgetPath="C:\Users\davila\Creatools\For_mingw64\DeveloperTools\wget32\wget.exe"
 
 ::if not exist %zipPath% set zipPath="%ProgramFilesPath_x64%\7-Zip\7z.exe"
 ::if not exist %zipPath% (
@@ -53,8 +50,6 @@ set sourcepath=%thirdpartyGeneration%\tps
 set LogFolder=%thirdpartyGeneration%\installLog
 
 set QTFNAME=qt-everywhere-opensource-src-4.8.2.zip
-
-
 ::set ITKFNAME=InsightToolkit-3.20.1.zip
 set ITKFNAME=InsightToolkit-4.12.1.tar
 ::set WXFNAME=wxWidgets-2.8.12.zip
@@ -63,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
@@ -76,8 +71,8 @@ set VTKFNAME=VTK-8.1.1-Patch.7z
 set GDCMFNAME=gdcm13_2018_05_28_vtk8.zip
 set TTHFNAME=tth_exe.zip
 set SQLITEFNAME=sqlite_v3.6.23.1.zip
-
 set JOMFNAME=jom.zip
+set DLFCNFNAME=dlfcn-win32-2018-07.7z
 
 
 echo -----------------------------------
@@ -208,6 +203,20 @@ if %EEDdownloadSQLite%==FALSE GOTO SKIPDOWNLOADSQLITE
 :SKIPDOWNLOADSQLITE
 
 
+if %EEDdownloadDLFCN%==FALSE GOTO SKIPDOWNLOADDLFCN
+  %wgetPath% --no-check-certificate "%urlCreatisSource%/%DLFCNFNAME%"
+::  git clone https://github.com/dlfcn-win32/dlfcn-win32.git
+  echo ------------------------------------------------
+  echo --------------DLFCN (creatis)------------------
+  echo ------------------------------------------------
+  cd %sourcepath%
+  %zipPath% x %DLFCNFNAME%
+::  del %DLFCNFNAME%
+:SKIPDOWNLOADDLFCN
+
+
+
+
 echo -----------------------------------
 echo --------Renaming Folders-----------
 echo -----------------------------------