*** empty log message ***

[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..bd6aaddf20f13448b9b4bd7269646e81fccc383e 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
@@ -145,6 +145,10 @@ XCOPY %QTDIR%\src\gui\* %creaThirdPartyLibraries%\%qt%\src\gui /s /i
 echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
+
+set wxPrefixBase=wxbase29
+set wxPrefixmsw=wxmsw29
+
 mkdir %creaThirdPartyLibraries%\%wxWidgets%
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\include\
@@ -153,38 +157,40 @@ 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\
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase29u.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase29u_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase29u_xml.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_xml.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxexpat.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_adv.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_aui.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_core.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_gl.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_html.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_media.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_propgrid.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_ribbon.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_stc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_xrc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_adv.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_aui.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_core.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_gl.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_html.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_media.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_propgrid.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_ribbon.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_stc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_xrc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxregexu.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxscintilla.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 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 +207,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%