Changeset 9675 for code/trunk/src/libraries/core/GraphicsManager.h

Timestamp:

Sep 26, 2013, 11:03:33 PM (12 years ago)

Author:

landauf

Message:

merged branch 'libs' back to trunk. orxonox now compiles and runs with ogre 1.8 and it compiles (but doesn't run) with cegui 0.8

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/GraphicsManager.h (modified) (1 diff)

code/trunk/src/libraries/core/GraphicsManager.h

@@ -108 +108 @@
 
         // event from Ogre::LogListener
-        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml,
-        bool maskDebug, const std::string& logName);
+#if OGRE_VERSION >= 0x010800
+        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage);
+#else
+        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName);
+#endif
 
         // console commands