DFCH: ThirdParty Libraries installer generator working -- script tested and updated...

[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 542af4010682f9766de3cf2180e943a50fc16fb4..8865a55a7d7c74f39c226ca46704a6d121303c03 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -65,8 +65,8 @@ if not exist %MIKTEXPFDIR% (
 
 echo if(%buildType%==release)(
        set qtBtype=4
-       set wxPrefixBase=wxbase29
-       set wxPrefixmsw=wxmsw29
+       set wxPrefixBase=wxbase28
+       set wxPrefixmsw=wxmsw28
        set boostMT=-vc100-mt-1_49.lib
        set boostMTGD=-vc100-mt-gd-1_49.lib
        set boostMTS=-vc100-mt-s-1_49.lib
@@ -77,6 +77,14 @@ echo         set wxPrefixBase=wxbase293d
 echo   set wxPrefixmsw=wxmsw293d
 echo )
 
+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 -----------------------------------
@@ -176,29 +184,29 @@ 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\%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\%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%_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%_qa.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%_xrc.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\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxregex.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\msw
-
-XCOPY %WXDIR%\lib\vc_dll\msw\* %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\msw /s /i
+mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_adv.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_aui.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_core.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_html.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_media.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_xrc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxexpat.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxregex.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxtiff.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxzlib.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+
+mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\msw
+
+XCOPY %WXDIR%\lib\%vcFolder%\msw\* %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\msw /s /i
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\jpeg
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\png
@@ -321,7 +329,7 @@ mkdir %creaThirdPartyLibraries%\%xercesc%\lib\
 
 XCOPY %XERCESDIR%\src\* %creaThirdPartyLibraries%\%xercesc%\include\ /s /i
 
-copy /V /Y %XERCESDIR%\Build\Win32\VC10\Release\xerces-c_3.lib %creaThirdPartyLibraries%\%xercesc%\lib\
+copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3.lib %creaThirdPartyLibraries%\%xercesc%\lib\
 
 
 echo -----------------------------------