[Orxonox-commit 7179] r11796 - code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud
landauf at orxonox.net
landauf at orxonox.net
Wed Feb 21 00:31:17 CET 2018
Author: landauf
Date: 2018-02-21 00:31:17 +0100 (Wed, 21 Feb 2018)
New Revision: 11796
Modified:
code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDPickupSystem.cc
code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/StoryModeHUD.cc
Log:
fixed build
Modified: code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDPickupSystem.cc
===================================================================
--- code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDPickupSystem.cc 2018-02-20 23:03:52 UTC (rev 11795)
+++ code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDPickupSystem.cc 2018-02-20 23:31:17 UTC (rev 11796)
@@ -29,9 +29,13 @@
#include <vector>
#include <string>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
+#if OGRE_VERSION >= 0x010900
+# include <Overlay/OgreOverlayManager.h>
+# include <Overlay/OgrePanelOverlayElement.h>
+#else
+# include <OgreOverlayManager.h>
+# include <OgrePanelOverlayElement.h>
+#endif
#include "HUDPickupSystem.h"
Modified: code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/StoryModeHUD.cc
===================================================================
--- code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/StoryModeHUD.cc 2018-02-20 23:03:52 UTC (rev 11795)
+++ code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/StoryModeHUD.cc 2018-02-20 23:31:17 UTC (rev 11796)
@@ -35,10 +35,17 @@
// Ogre stuff
#include <OgreCamera.h>
-#include <OgreFontManager.h>
-#include <OgreOverlayManager.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
+#if OGRE_VERSION >= 0x010900
+# include <Overlay/OgreFontManager.h>
+# include <Overlay/OgreOverlayManager.h>
+# include <Overlay/OgreTextAreaOverlayElement.h>
+# include <Overlay/OgrePanelOverlayElement.h>
+#else
+# include <OgreFontManager.h>
+# include <OgreOverlayManager.h>
+# include <OgreTextAreaOverlayElement.h>
+# include <OgrePanelOverlayElement.h>
+#endif
// Other stuff
#include <typeinfo>
More information about the Orxonox-commit
mailing list