Changeset 11795 for code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc

Timestamp:

Feb 21, 2018, 12:03:52 AM (6 years ago)

Author:

landauf

Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:

code/branches/cegui0.8_ogre1.9

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/InGameConsole.cc (modified) (1 diff)

code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc

@@ -32 +32 @@
 #include <algorithm>
 #include <string>
-#include <OgreOverlay.h>
-#include <OgreOverlayElement.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
-#include <OgreBorderPanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgreFontManager.h>
-#include <OgreFont.h>
+#include <OgrePrerequisites.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlay.h>
+#   include <Overlay/OgreOverlayElement.h>
+#   include <Overlay/OgreOverlayManager.h>
+#   include <Overlay/OgreOverlayContainer.h>
+#   include <Overlay/OgreBorderPanelOverlayElement.h>
+#   include <Overlay/OgreTextAreaOverlayElement.h>
+#   include <Overlay/OgreFontManager.h>
+#   include <Overlay/OgreFont.h>
+#else
+#   include <OgreOverlay.h>
+#   include <OgreOverlayElement.h>
+#   include <OgreOverlayManager.h>
+#   include <OgreOverlayContainer.h>
+#   include <OgreBorderPanelOverlayElement.h>
+#   include <OgreTextAreaOverlayElement.h>
+#   include <OgreFontManager.h>
+#   include <OgreFont.h>
+#endif
 
 #include "util/Clock.h"