DFCH: wxWidgets 2.8.12 updates

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
index e80eaf4f3ac8fb348913b8e305b469918d173d90..5a28fcde0d3541c4753ed44caa94bde85ded990b 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
@@ -49,12 +49,12 @@ IF(WIN32 AND NOT UNIX)
   SET(CPACK_NSIS_MODIFY_PATH OFF)
 
 
-  set  (CREA_BOOST_LYBRARY     Boost-1.47.0)
+  set  (CREA_BOOST_LYBRARY     Boost-1.46.1)
   set  (CREA_GDCM_LYBRARY      gdcm )
   set  (CREA_ITK_LYBRARY       InsightToolkit-3.20.0 )
   set  (CREA_QT_LYBRARY                Qt-4.7.3 )
   set  (CREA_VTK_LYBRARY       VTK )  
-  set  (CREA_WXWIN_LYBRARY     wxWidgets-2.9.2)
+  set  (CREA_WXWIN_LYBRARY     wxWidgets-2.8.12)
   set  (CREA_XERCES_LYBRARY    xerces-c-3.1.1)
   set  (CREA_MIKATEX_LYBRARY   MiKTeX-2.9)
   

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index 3b37ad9b7e6a0dbc76a5dd5f1dcc5c6b944d6ec5..f2da22774a31460f8d39d19daed1b548621141ab 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -15,7 +15,7 @@ set sourcepath=%thirdpartyGeneration%\thirdparty_source
 set creaThirdPartydlls=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls
 
 set qt=Qt-4.7.3
-set wxWidgets=wxWidgets-2.9.2
+set wxWidgets=wxWidgets-2.8.12
 set boost=Boost-1.46.1
 set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
@@ -59,8 +59,8 @@ echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
 
-set wxPrefixBase=wxbase292
-set wxPrefixmsw=wxmsw292
+set wxPrefixBase=wxbase28
+set wxPrefixmsw=wxmsw28
 
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartydlls%
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_vc_custom.dll %creaThirdPartydlls%

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index bd6aaddf20f13448b9b4bd7269646e81fccc383e..5f9ace15badd100854c0d460f0bb459948524f90 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -27,7 +27,7 @@ set sourcepath=%thirdpartyGeneration%\thirdparty_source
 set creaThirdPartyLibraries=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries
 
 set qt=Qt-4.7.3
-set wxWidgets=wxWidgets-2.9.2
+set wxWidgets=wxWidgets-2.8.12
 set boost=Boost-1.46.1
 set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
@@ -146,8 +146,8 @@ echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
 
-set wxPrefixBase=wxbase29
-set wxPrefixmsw=wxmsw29
+set wxPrefixBase=wxbase28
+set wxPrefixmsw=wxmsw28
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%
 
@@ -173,18 +173,13 @@ copy /V /Y %WXDIR%\lib\vc_dll\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\l
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_adv.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_aui.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_core.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_gl.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_html.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_media.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_propgrid.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_ribbon.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_stc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_xrc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxregexu.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxscintilla.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\wxregex.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxtiff.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxzlib.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll