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

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

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index 0fc484cd5cdd597dd2a55337234eaa87fa7ffcea..b41c358917af198b8a86d25e2b0e5ee2ec46659a 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -8,6 +8,8 @@ echo -----------------------------------
 
 set thirdpartyGeneration=%1
 set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
 set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
@@ -55,12 +57,17 @@ 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 -----------------------------------
@@ -105,6 +112,33 @@ copy /V /Y %QTDIR%\bin\QtTest%qtBtype%.dll %creaThirdPartydlls%
 copy /V /Y %QTDIR%\bin\QtXml%qtBtype%.dll %creaThirdPartydlls%
 copy /V /Y %QTDIR%\bin\QtXmlPatterns%qtBtype%.dll %creaThirdPartydlls%
 
+:: 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\assistant.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\designer.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\dumpcpp.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\idc.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\lconvert.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\linguist.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\lrelease.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\lupdate.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\moc.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\pixeltool.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qcollectiongenerator.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qhelpconverter.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qhelpgenerator.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qmake.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qt3to4.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qtdemo.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\rcc.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\uic.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\uic3.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\xmlpatterns.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\Qt3Support%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartydlls%
+::End of temporal copy
+
 echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------