Changeset 11101 for code/trunk

Timestamp:

Jan 31, 2016, 10:57:21 AM (8 years ago)

Author:

landauf

Message:

fixed build when combining new cegui with old ogre

Location:

code/trunk

Files:

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

code/trunk/cmake/tools/FindCEGUI.cmake

@@ -48 +48 @@
   )
 ELSE()
-  # 0.8 and older
+  # 0.7 and older
   FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
     PATHS $ENV{CEGUIDIR}

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

@@ -251 +251 @@
             }
         }
+#if OGRE_VERSION < 0x010700
+        virtual void renderQueueEnded(Ogre::uint8 id, const Ogre::String& invocation, bool& repeatThisInvocation) override {}
+#endif
     };
 #endif