DFCH: Install_ThirdParty script is now working in windows x64 =)

[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 8865a55a7d7c74f39c226ca46704a6d121303c03..edfabdc9ebe44257189be20c6eb98b920eba4c2c 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -19,6 +19,8 @@ echo -----------------------------------
 
 set thirdpartyGeneration=%1
 set thirdpartyInstallPath=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 set MIKTEXPFDIR="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe"
 
@@ -67,24 +69,29 @@ echo if(%buildType%==release)(
        set qtBtype=4
        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
-       set boostMTSGD=-vc100-mt-sgd-1_49.lib
+       set boostMT=-vc100-mt-1_49.*
+       set boostMTGD=-vc100-mt-gd-1_49.*
+       set boostMTS=-vc100-mt-s-1_49.*
+       set boostMTSGD=-vc100-mt-sgd-1_49.*
 echo ) else (
 echo   set qtBtype=d4
 echo   set wxPrefixBase=wxbase293d
 echo   set wxPrefixmsw=wxmsw293d
 echo )
 
-if %PROCESSOR_ARCHITECTURE%==x86  (
+if %x86Comp%==ON (
        set vcFolder=vc_dll
        set winType=Win32
 ) else (
-       set vcFolder=vc_amd64_dll
-       set winType=Win64
+       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 -----------------------------------
@@ -154,6 +161,21 @@ copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 
+:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
+copy /V /Y %QTDIR%\bin\phonon%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtGui%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtNetwork%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtOpenGL%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtScript%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtScriptTools%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtSql%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtSvg%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtTest%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtXml%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtXmlPatterns%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+::End of temporal copy
+
 XCOPY %QTDIR%\lib\*.lib %creaThirdPartyLibraries%\%qt%\lib\ /i
 
 mkdir %creaThirdPartyLibraries%\%qt%\src\corelib
@@ -186,6 +208,21 @@ copy /V /Y %WXDIR%\lib\vms_gtk.opt %creaThirdPartyLibraries%\%wxWidgets%\lib\
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
 
+:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_adv_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_aui_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_core_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_gl_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_html_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_media_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_qa_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_richtext_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_xrc_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+::End of temporal copy
+
 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%
@@ -331,6 +368,9 @@ XCOPY %XERCESDIR%\src\* %creaThirdPartyLibraries%\%xercesc%\include\ /s /i
 
 copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3.lib %creaThirdPartyLibraries%\%xercesc%\lib\
 
+:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
+copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3_1.dll %creaThirdPartyLibraries%\%xercesc%\lib\
+
 
 echo -----------------------------------
 echo -------------ITK-------------------
@@ -377,12 +417,12 @@ echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\tth
 XCOPY %TTHDIR%\* %creaThirdPartyLibraries%\%tth% /s /i
 
-echo -----------------------------------
-echo -------------MiKText---------------
-echo -----------------------------------
-mkdir %creaThirdPartyLibraries%\%miktexAux%
+::echo -----------------------------------
+::echo -------------MiKText---------------
+::echo -----------------------------------
+::mkdir %creaThirdPartyLibraries%\%miktexAux%
 
-XCOPY %MIKTEXPFDIR%\* %MIKTEXDIR% /s /i
+::XCOPY %MIKTEXPFDIR%\* %MIKTEXDIR% /s /i
 
 
 echo -----------------------------------