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 6863283f04b0521d5c75e5054671409dfccbd2c2..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----
@@ -22,11 +29,15 @@ echo starting time
 time /t
 date /T
 
-cd scripts
+set scripts=%cd%\scripts
+
+cd %scripts%
 
 echo Calling download_ThirdPartySW.bat
 
-call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% >> downloadTP.log 2>&1
+call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >> downloadThirdParty.log 2>&1
+
+cd %scripts%
 
 echo Calling install_thirdparty.bat
 
@@ -34,10 +45,14 @@ start /wait install_thirdparty.bat %thirdpartyGeneration% %buildType%
 
 echo Calling generateThirdPartydllsExe.bat
 
+cd %scripts%
+
 start /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType%
 
 echo Calling generateThirdPartyLibExe.bat
 
+cd %scripts%
+
 start /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType%
 
 cd..