[Orxonox-commit 6471] r11117 - in code/trunk: cmake cmake/tools src/libraries/core

[landauf at orxonox.net]

Author: landauf
Date: 2016-02-15 22:54:29 +0100 (Mon, 15 Feb 2016)
New Revision: 11117

Modified:
   code/trunk/cmake/PackageConfigMinGW.cmake
   code/trunk/cmake/tools/FindCEGUI.cmake
   code/trunk/src/libraries/core/GUIManager.cc
Log:
preparing for CEGUI 0.8

Modified: code/trunk/cmake/PackageConfigMinGW.cmake
===================================================================
--- code/trunk/cmake/PackageConfigMinGW.cmake	2016-02-14 17:20:50 UTC (rev 11116)
+++ code/trunk/cmake/PackageConfigMinGW.cmake	2016-02-15 21:54:29 UTC (rev 11117)
@@ -28,7 +28,7 @@
 IF(MINGW)
 
   INCLUDE(CheckPackageVersion)
-  CHECK_PACKAGE_VERSION(7.1)
+  CHECK_PACKAGE_VERSION(7.1 8.0)
 
   # 64 bit system?
   IF(CMAKE_SIZEOF_VOID_P EQUAL 8)

Modified: code/trunk/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/trunk/cmake/tools/FindCEGUI.cmake	2016-02-14 17:20:50 UTC (rev 11116)
+++ code/trunk/cmake/tools/FindCEGUI.cmake	2016-02-15 21:54:29 UTC (rev 11117)
@@ -105,7 +105,7 @@
 )
 # Find CEGUI Tolua++ libraries
 FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_OPTIMIZED
-  NAMES CEGUItoluapp tolua++ ceguitolua++ tolua++5.1
+  NAMES CEGUItoluapp tolua++ toluapp ceguitolua++ tolua++5.1
   PATHS $ENV{CEGUIDIR} ${CEGUITOLUADIR}
   PATH_SUFFIXES lib bin
 )

Modified: code/trunk/src/libraries/core/GUIManager.cc
===================================================================
--- code/trunk/src/libraries/core/GUIManager.cc	2016-02-14 17:20:50 UTC (rev 11116)
+++ code/trunk/src/libraries/core/GUIManager.cc	2016-02-15 21:54:29 UTC (rev 11117)
@@ -906,10 +906,11 @@
     {
 #if CEGUI_VERSION >= 0x000800
         this->guiRenderer_->setDisplaySize(CEGUI::Sizef((float)newWidth, (float)newHeight));
+        this->rootWindow_->setSize(CEGUI::USize(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
 #else
         this->guiRenderer_->setDisplaySize(CEGUI::Size((float)newWidth, (float)newHeight));
+        this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
 #endif
-        this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
     }
 
     /**