DFCH: boost and wxWidgets changes

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

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index e62112eb225dfb593858a9fe588a991b90f3e246..b7f9863ef8dc28d4beab6437280ebeff3ef76764 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -28,7 +28,7 @@ set creaThirdPartyLibraries=%thirdpartyGeneration%\thirdparty_temp\creaThirdPart
 
 set qt=Qt-4.7.3
 set wxWidgets=wxWidgets-2.9.2
-set boost=Boost-1.47.0
+set boost=Boost-1.46.1
 set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
@@ -153,6 +153,8 @@ mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\
 
 XCOPY %WXDIR%\include\* %creaThirdPartyLibraries%\%wxWidgets%\include\ /s /i
 
+copy /V /Y %WXDIR%\wx-config.in %creaThirdPartyLibraries%\%wxWidgets%\
+
 copy /V /Y %WXDIR%\lib\dummy %creaThirdPartyLibraries%\%wxWidgets%\lib\
 copy /V /Y %WXDIR%\lib\vms.opt %creaThirdPartyLibraries%\%wxWidgets%\lib\
 copy /V /Y %WXDIR%\lib\vms_gtk.opt %creaThirdPartyLibraries%\%wxWidgets%\lib\
@@ -182,9 +184,9 @@ copy /V /Y %WXDIR%\lib\vc_dll\wxscintilla.lib %creaThirdPartyLibraries%\%wxWidge
 copy /V /Y %WXDIR%\lib\vc_dll\wxtiff.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxzlib.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 
-mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\mswu
+mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\msw
 
-XCOPY %WXDIR%\lib\vc_dll\mswu\* %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\mswu /s /i
+XCOPY %WXDIR%\lib\vc_dll\msw\* %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\msw /s /i
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\jpeg
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\png
@@ -201,10 +203,10 @@ echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
-set boostMT=-vc100-mt-1_47.lib
-set boostMTGD=-vc100-mt-gd-1_47.lib
-set boostMTS=-vc100-mt-s-1_47.lib
-set boostMTSGD=-vc100-mt-sgd-1_47.lib
+set boostMT=-vc100-mt-1_46_1.lib
+set boostMTGD=-vc100-mt-gd-1_46_1.lib
+set boostMTS=-vc100-mt-s-1_46_1.lib
+set boostMTSGD=-vc100-mt-sgd-1_46_1.lib
 
 mkdir %creaThirdPartyLibraries%\%boost%