From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Sat, 17 Dec 2011 13:48:21 +0000 (+0000)
Subject: DFCH: wxWidgets version downgrade to 2.8.12
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=commitdiff_plain;h=00b3d4ed04b5859c4cde1d0ec4b8896a677c7f5a

DFCH: wxWidgets version downgrade to 2.8.12
---

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index e1dc428..f84f1e4 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -61,7 +61,9 @@ set binpath=%thirdpartyGeneration%\thirdparty_bin
 set sourcepath=%thirdpartyGeneration%\thirdparty_source
 
 set qt=Qt-4.7.3
-set wxWidgets=wxWidgets-2.9.2
+set buildWxWidgets28=1
+if %buildWxWidgets28%==1 set wxWidgets=wxWidgets-2.8.12
+if %buildWxWidgets28%==0 set wxWidgets=wxWidgets-2.9.2
 set boost=Boost-1.46.1
 set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
@@ -104,13 +106,13 @@ echo ITKSRCDIR=%ITKSRCDIR%
 echo VTKSRCDIR=%VTKSRCDIR%
 echo GDCMDIR=%GDCMSRCDIR%
 
-
 echo -----------------------------------
 echo ---End Setting Global Variables----
 echo -----------------------------------
 
 
 call %vcvarsall%
+goto next
 echo -----------------------------------
 echo -------Creating Folders------------
 echo -----------------------------------
@@ -130,18 +132,22 @@ echo ------End Creating Folders---------
 echo -----------------------------------
 echo ------Downloading Sources----------
 echo -----------------------------------
-
+:next
 cd %thirdpartyGeneration%\thirdparty_source\
 %wgetPath% %urlCreatisSource%/qt-4.7.3.zip
-%wgetPath% %urlCreatisSource%/wxWidgets-2.9.2.7z
-%wgetPath% %urlCreatisSource%/boost_1_47_0.7z
+IF %buildWxWidgets28%==0 (
+  %wgetPath% %urlCreatisSource%/wxWidgets-2.9.2.7z
+) ELSE (
+  %wgetPath% %urlCreatisSource%/wxWidgets-2.8.12.tar.gz
+)
+goto next
+%wgetPath% %urlCreatisSource%/boost_1_46_1.7z
 %wgetPath% %urlCreatisSource%/vtk-5.8.0.tar.gz
 %wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip
 %wgetPath% %urlCreatisSource%/gdcm_11_Oct_2011.tar.gz
 %wgetPath% %urlCreatisSource%/xerces-c-3.1.1.zip
 %wgetPath% %urlCreatisSource%/tth_exe.zip
 echo ------End Downloading Sources------
-
 echo -----------------------------------
 echo --------Qt Installation------------
 echo -----------------------------------
@@ -171,21 +177,31 @@ echo -----------------------------------
 echo -----wxWidgets Installation--------
 echo -----------------------------------
 echo ----------Extracting---------------
-
+:next
 cd %sourcepath%
-md %wxWidgets%
-cd %wxWidgets%
-%zipPath% x %sourcepath%\wxWidgets-2.9.2.7z
-del %sourcepath%\wxWidgets-2.9.2.7z
-
+IF %buildWxWidgets28%==0 (
+  md %wxWidgets%
+  cd %wxWidgets%
+  %zipPath% x %sourcepath%\wxWidgets-2.9.2.7z
+  del %sourcepath%\wxWidgets-2.9.2.7z
+) ELSE (
+ %zipPath% x %sourcepath%\wxWidgets-2.8.12.tar.gz
+ %zipPath% x %sourcepath%\wxWidgets-2.8.12.tar
+ del %sourcepath%\wxWidgets-2.8.12.tar.gz
+ del %sourcepath%\wxWidgets-2.8.12.tar
+)
 echo ----------Installing---------------
 
 cd %sourcepath%\%wxWidgets%\build\msw
-nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1
+IF %buildWxWidgets28%==0 (
+  nmake -f makefile.vc BUILD=%buildType% USE_OPENGL=1 USE_GUI=1 UNICODE=0 SHARED=1
+) ELSE (
+  nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1
+)
 cd C:\
 
 echo ----End wxWidgets Installation-----
-
+goto next
 echo -----------------------------------
 echo ------Boost Installation-----------
 echo -----------------------------------
@@ -324,5 +340,5 @@ cd c:\
 echo -----------------------------------
 echo ---End of Installing Libraries-----
 echo -----------------------------------
-
+:next
 exit /B
\ No newline at end of file