[Orxonox-commit 3256] r7947 - in code/branches/kicklib: . cmake src/libraries/util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-02-21 04:35:28 +0100 (Mon, 21 Feb 2011)
New Revision: 7947

Modified:
   code/branches/kicklib/INSTALL
   code/branches/kicklib/cmake/LibraryConfig.cmake
   code/branches/kicklib/src/libraries/util/Exception.cc
Log:
Dropping support for CEGUI v0.5 as v0.6 has been available for three years now.

Modified: code/branches/kicklib/INSTALL
===================================================================
--- code/branches/kicklib/INSTALL	2011-02-21 02:47:54 UTC (rev 7946)
+++ code/branches/kicklib/INSTALL	2011-02-21 03:35:28 UTC (rev 7947)
@@ -9,7 +9,7 @@
 (for windows there are already precompiled packages on the website)
 
 OGRE 3D Graphics Engine          1.4 - 1.7
-CEGUI (Crazy Eddie's GUI System) 0.5 - 0.6
+CEGUI (Crazy Eddie's GUI System) 0.6
 Boost libraries                  1.35 -
 ENet (Network library)           1.1 - 1.2
 Lua (scripting language)         5.0 - 5.1

Modified: code/branches/kicklib/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/LibraryConfig.cmake	2011-02-21 02:47:54 UTC (rev 7946)
+++ code/branches/kicklib/cmake/LibraryConfig.cmake	2011-02-21 03:35:28 UTC (rev 7947)
@@ -114,7 +114,7 @@
 # the linked library must be EXACTLY the same.
 # Since Lua v5.1 has been out for a long while, this does not seem to be a
 # problem anymore, at least as long as Lua 5.2 is not released.
-FIND_PACKAGE(CEGUI 0.5 REQUIRED)
+FIND_PACKAGE(CEGUI 0.6 REQUIRED)
 
 ##### OpenAL #####
 FIND_PACKAGE(OpenAL REQUIRED)

Modified: code/branches/kicklib/src/libraries/util/Exception.cc
===================================================================
--- code/branches/kicklib/src/libraries/util/Exception.cc	2011-02-21 02:47:54 UTC (rev 7946)
+++ code/branches/kicklib/src/libraries/util/Exception.cc	2011-02-21 03:35:28 UTC (rev 7947)
@@ -100,12 +100,8 @@
         }
         catch (const CEGUI::Exception& ex)
         {
-#if CEGUI_VERSION_MAJOR == 0 && CEGUI_VERSION_MINOR < 6
-            return GeneralException(ex.getMessage().c_str()).getDescription();
-#else
             return GeneralException(ex.getMessage().c_str(), ex.getLine(),
                 ex.getFileName().c_str(), ex.getName().c_str()).getDescription();
-#endif
         }
         catch (...)
         {