X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_dlls.bat;h=d538fcede2b2e0e6235d302e9e3171d3bfbc58df;hb=202b0b1a7dc0552a8c4a9eb1c9c48b6866af6404;hp=5c6da0f1514602f17c6fde9f4a9092b58a934114;hpb=4a364787d3f71bd8010767cd1b7ec3befda665f4;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index 5c6da0f..d538fce 100644
--- 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
 
@@ -44,22 +46,35 @@ mkdir %creaThirdPartydlls%
 echo setting buildtype libraries
 echo if(%buildType%=="release")(
 	set qtBtype=4
-	set wxPrefixBase=wxbase293
-	set wxPrefixmsw=wxmsw293
+	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 )
+	) 
+::else (
+::echo	set qtBtype=d4
+::echo	set wxPrefixBase=wxbase293d
+::echo	set wxPrefixmsw=wxmsw293d
+::echo )
+
+
+if %x86Comp%==ON (
+	set vcFolder=vc_dll
+	set winType=Win32
+) else (
+	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 ThirdpartyGeneration=%thirdpartyGeneration%
-echo MikTex=%miktex%
-echo miktexAux=%miktexAux%
 echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
@@ -101,18 +116,18 @@ echo -------------wxWidgets-------------
 echo -----------------------------------
 
 
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_xml_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_adv_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_aui_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_core_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_gl_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_html_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_media_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_qa_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_richtext_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_xrc_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_adv_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_aui_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_core_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_gl_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_html_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_media_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_qa_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_richtext_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_xrc_vc_custom.dll %creaThirdPartydlls%
 
 
 echo -----------------------------------
@@ -153,7 +168,7 @@ echo -----------------------------------
 echo -------------Xcerces---------------
 echo -----------------------------------
 
-copy /V /Y %XERCESDIR%\Build\Win32\VC10\Release\xerces-c_3_1.dll %creaThirdPartydlls%
+copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3_1.dll %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------ITK-------------------