Changeset 11117 for code/trunk

Timestamp:

Feb 15, 2016, 10:54:29 PM (9 years ago)

Author:

landauf

Message:

preparing for CEGUI 0.8

Location:

code/trunk

Files:

• cmake/PackageConfigMinGW.cmake (modified) (1 diff)
• cmake/tools/FindCEGUI.cmake (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (1 diff)

code/trunk/cmake/PackageConfigMinGW.cmake

@@ -29 +29 @@
 
   INCLUDE(CheckPackageVersion)
-  CHECK_PACKAGE_VERSION(7.1)
+  CHECK_PACKAGE_VERSION(7.1 8.0)
 
   # 64 bit system?

code/trunk/cmake/tools/FindCEGUI.cmake

@@ -106 +106 @@
 # 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

code/trunk/src/libraries/core/GUIManager.cc

@@ -907 +907 @@
 #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));
-#endif
         this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
+#endif
     }