DFCH: Update for x84 and x64 bit compilation

[creaToolsTools.git] / Install_ThirdParty / install_generate_thirdparty.bat_TEMPLATE

diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
index 01faf825bec050f36074c6d3137317b5cac12671..6ef05bea5acf2dbf98407e9c929577643ce3abb1 100644 (file)
--- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
+++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
@@ -6,9 +6,16 @@ echo -----------------------------------
 
 set thirdpartyGeneration=<directory where you want to generate>
 set buildType=<debug|release|RelWithDebInfo>
+::The following line sets wxWidgets version. Set it ON if you want to compile wxWidgets 2.8.12
+::The following line set swxWidgets version. Set it OFF if you want to compile wxWidgets 2.9.3
+set wxStable=<ON|OFF>
+::Set the following line ON if you want to force x86 compilation
+set forcex86=OFF
+
 
 echo thirdpartyGeneration=%thirdpartyGeneration%
 echo buildType=%buildType%
+echo wxStable=%wxStable%
 
 echo -----------------------------------
 echo ---End Setting Global Variables----
@@ -18,33 +25,46 @@ echo -----------------------------------
 echo -------Calling Scripts-------------
 echo -----------------------------------
 
-cd scripts
+echo starting time
+time /t
+date /T
+
+set scripts=%cd%\scripts
+
+cd %scripts%
 
-echo Calling install_thirdparty_all.bat
+echo Calling download_ThirdPartySW.bat
 
-call install_thirdparty_all.bat  %thirdpartyGeneration% %buildType% >> install_generate_thirdparty.log 2>&1
+call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >> downloadThirdParty.log 2>&1
 
-echo Calling move_thirdparty_dlls.bat
+cd %scripts%
 
-call move_thirdparty_dlls.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1
+echo Calling install_thirdparty.bat
 
-echo Calling move_thirdparty_libraries.bat
+start /wait install_thirdparty.bat %thirdpartyGeneration% %buildType%
 
-call move_thirdparty_libraries.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1
+echo Calling generateThirdPartydllsExe.bat
 
-echo Calling install_thirdparty_dlls_cmake.bat
+cd %scripts%
 
-call install_thirdparty_dlls_cmake.bat  %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1
+start /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType%
 
-echo Calling install_thirdparty_libraries_cmake.bat
+echo Calling generateThirdPartyLibExe.bat
 
-call install_thirdparty_libraries_cmake.bat  %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1
+cd %scripts%
 
-cd ..
+start /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType%
+
+cd..
 
 echo -----------------------------------
 echo -------End of the Script-----------
 echo -----------------------------------
 
+echo ending time
+time /t
+date /T
+
 pause
+
 exit
\ No newline at end of file