X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_dlls.bat;h=5aea0bcd546b1df71f61eb3d0ff330043d7cd94d;hb=baa0516e21e1f4a6a838b48f008e9e60d6fb84d3;hp=a3f9140778319cf23a4f6a149de36a60d9a92f12;hpb=3afceddce806ddbeb6870383aac236cac7082ff2;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index a3f9140..5aea0bc 100644
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -15,8 +15,8 @@ set sourcepath=%thirdpartyGeneration%\thirdparty_source
 set creaThirdPartydlls=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls
 
 set qt=Qt-4.7.3
-set wxWidgets=wxWidgets-2.9.2
-set boost=Boost-1.47.0
+set wxWidgets=wxWidgets-2.8.12
+set boost=Boost-1.46.1
 set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
@@ -29,6 +29,7 @@ set XERCESDIR=%sourcepath%\%xercesc%
 set ITKSRCDIR=%sourcepath%\%itk%
 set VTKSRCDIR=%sourcepath%\%VTK%
 set GDCMSRCDIR=%sourcepath%\%gdcm%
+set BOOSTINSTALLDIR=%installpath%\%boost%
 set ITKINSTALLDIR=%installpath%\%itk%
 set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
@@ -58,52 +59,58 @@ echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
 
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_net_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_xml_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_adv_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_aui_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_core_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_gl_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_html_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_media_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_qa_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll %creaThirdPartydlls%
+set wxPrefixBase=wxbase28
+set wxPrefixmsw=wxmsw28
+
+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%
 
 
 echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
-copy /V /Y %BOOSTDIR%\stage\lib\boost_date_time-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_date_time-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_filesystem-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_filesystem-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_graph-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_graph-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_iostreams-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_iostreams-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_prg_exec_monitor-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_prg_exec_monitor-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_program_options-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_program_options-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_regex-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_regex-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_serialization-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_serialization-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_signals-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_signals-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_system-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_system-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_thread-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_thread-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_unit_test_framework-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_unit_test_framework-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wave-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wave-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wserialization-vc100-mt-1_47.dll %creaThirdPartydlls%
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wserialization-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+set boostMT=-vc100-mt-1_46_1.dll
+set boostMTGD=-vc100-mt-gd-1_46_1.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%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_filesystem%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_graph%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_graph%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_iostreams%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_iostreams%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_prg_exec_monitor%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_prg_exec_monitor%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_program_options%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_program_options%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_regex%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_regex%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_serialization%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_serialization%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_signals%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_signals%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_system%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_system%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_thread%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_thread%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_unit_test_framework%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_unit_test_framework%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_wave%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_wave%boostMTGD% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_wserialization%boostMT% %creaThirdPartydlls%
+copy /V /Y %BOOSTINSTALLDIR%\lib\boost_wserialization%boostMTGD% %creaThirdPartydlls%
 
 
 echo -----------------------------------
@@ -116,45 +123,16 @@ echo -----------------------------------
 echo -------------ITK-------------------
 echo -----------------------------------
 
-copy /V /Y %ITKINSTALLDIR%\bin\ITKCommon.dll %creaThirdPartydlls%
-copy /V /Y %ITKINSTALLDIR%\bin\itkTestDriver.exe %creaThirdPartydlls%
+copy /V /Y %ITKINSTALLDIR%\bin\*.exe %creaThirdPartydlls%
+copy /V /Y %ITKINSTALLDIR%\bin\*.dll %creaThirdPartydlls%
 
 
 echo -----------------------------------
 echo -------------VTK-------------------
 echo -----------------------------------
 
-copy /V /Y %VTKINSTALLDIR%\bin\vtkEncodeString.exe %creaThirdPartydlls%
-
-copy /V /Y %VTKINSTALLDIR%\bin\QVTK.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkalglib.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkCommon.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkDICOMParser.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkexoIIc.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkexpat.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkFiltering.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkfreetype.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkftgl.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkGenericFiltering.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkGraphics.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkHybrid.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkImaging.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkInfovis.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkIO.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkjpeg.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtklibxml2.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkmetaio.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkNetCDF.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkpng.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkproj4.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkRendering.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtksys.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtktiff.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkverdict.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkViews.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkVolumeRendering.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkWidgets.dll %creaThirdPartydlls%
-copy /V /Y %VTKINSTALLDIR%\bin\vtkzlib.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\*.exe %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\*.dll %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------GDCM------------------
@@ -164,4 +142,6 @@ copy /V /Y %GDCMINSTALLDIR%\bin\*.exe %creaThirdPartydlls%
 copy /V /Y %GDCMINSTALLDIR%\bin\*.dll %creaThirdPartydlls%
 echo -----------------------------------
 echo ------End of Moving Dlls-----------
-echo -----------------------------------
\ No newline at end of file
+echo -----------------------------------
+
+exit /B
\ No newline at end of file