Bug #1908

[creaToolsTools.git] / Install_ThirdParty / scripts / move_thirdparty_dlls.bat

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index 0fc484cd5cdd597dd2a55337234eaa87fa7ffcea..0b3c0f34dc7f7ff9521a77f16550a6db5673e19f 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -8,6 +8,8 @@ echo -----------------------------------
 
 set thirdpartyGeneration=%1
 set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
 set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
@@ -21,7 +23,7 @@ set wxWidgets=wxWidgets
 set boost=boost
 set xercesc=xerces
 set itk=itk
-set gdcm=gdcm
+set gdcm=gdcm13
 set vtk=vtk
 set tth=tth
 
@@ -42,38 +44,43 @@ rmdir /S /Q %creaThirdPartydlls%
 mkdir %creaThirdPartydlls%
 
 echo setting buildtype libraries
-echo if(%buildType%=="release")(
+if %buildType%==release (
        set qtBtype=4
        set wxPrefixBase=wxbase28
        set wxPrefixmsw=wxmsw28
-       set boostMT=-vc100-mt-1_49.dll
-       set boostMTGD=-vc100-mt-gd-1_49.dll
-echo ) else (
-echo   set qtBtype=d4
-echo   set wxPrefixBase=wxbase293d
-echo   set wxPrefixmsw=wxmsw293d
-echo )
+       set xercesFile=xerces-c_3_1.dll
+) else (
+       set qtBtype=d4
+       set wxPrefixBase=wxbase28d
+       set wxPrefixmsw=wxmsw28d
+       set xercesFile=xerces-c_3_1D.dll
+)
 
 
-if %PROCESSOR_ARCHITECTURE%==x86  (
+if %x86Comp%==ON (
        set vcFolder=vc_dll
        set winType=Win32
 ) else (
-       set vcFolder=vc_amd64_dll
-       set winType=Win64
+       if %PROCESSOR_ARCHITECTURE%==x86  (
+               set vcFolder=vc_dll
+               set winType=Win32
+       ) else (
+               set vcFolder=vc_amd64_dll
+               set winType=Win64
+       )
 )
 
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
+echo buildType=%buildType%
 echo ThirdpartyGeneration=%thirdpartyGeneration%
-echo MikTex=%miktex%
-echo miktexAux=%miktexAux%
 echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
 echo creaThirdPartyLibraries=%thirdpartyInstallPath%\creaThirdParty_libraries
 echo QT=%qt%
+echo qtBtype=%qtBtype%
 echo WX=%wxWidgets%
 echo BOOST=%boost%
 echo Xercesc=%xercesc%
@@ -128,6 +135,11 @@ echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
+REM set boostMT=-vc100-mt-1_49.dll
+REM set boostMTGD=-vc100-mt-gd-1_49.dll
+set boostMT=-vc100-mt-1_52.dll
+set boostMTGD=-vc100-mt-gd-1_52.dll
+
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMT% %creaThirdPartydlls%
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMTGD% %creaThirdPartydlls%
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_filesystem%boostMT% %creaThirdPartydlls%
@@ -162,7 +174,7 @@ echo -----------------------------------
 echo -------------Xcerces---------------
 echo -----------------------------------
 
-copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3_1.dll %creaThirdPartydlls%
+copy /V /Y %XERCESDIR%\Build\%winType%\VC10\%buildType%\%xercesFile% %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------ITK-------------------