From 972c7890602bdecea6cadb0f1bbf4cbf5706f602 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Mon, 6 Oct 2014 20:25:09 +1100
Subject: [PATCH] Add Ogre Overlay path to cmake.

---
 CMakeLists.txt                                    | 2 +-
 apps/opencs/view/render/pagedworldspacewidget.cpp | 4 ++--
 apps/opencs/view/render/scenewidget.cpp           | 2 +-
 apps/opencs/view/render/textoverlay.cpp           | 9 ++++-----
 apps/opencs/view/render/textoverlay.hpp           | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 542ea3e94..3c1ebc524 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,7 +272,7 @@ endif ()
 endif(OGRE_STATIC)
 
 include_directories("."
-    ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE ${OGRE_INCLUDE_DIRS} ${OGRE_PLUGIN_INCLUDE_DIRS}
+    ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE ${OGRE_INCLUDE_DIRS} ${OGRE_PLUGIN_INCLUDE_DIRS} ${OGRE_INCLUDE_DIR}/Overlay
     ${SDL2_INCLUDE_DIR}
     ${Boost_INCLUDE_DIR}
     ${PLATFORM_INCLUDE_DIR}
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 6bd81d2f9..f93aeaf0e 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -8,8 +8,8 @@
 #include <OgreCamera.h>
 #include <OgreSceneManager.h>
 #include <OgreManualObject.h>
-#include <Overlay/OgreOverlayContainer.h>
-#include <Overlay/OgreOverlayManager.h>
+#include <OgreOverlayContainer.h>
+#include <OgreOverlayManager.h>
 #include <OgreRoot.h>
 #include <OgreSceneQuery.h>
 #include <OgreEntity.h>
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 431d94b7e..b84e528cb 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -11,7 +11,7 @@
 #include <OgreCamera.h>
 #include <OgreSceneNode.h>
 #include <OgreViewport.h>
-#include <Overlay/OgreOverlaySystem.h>
+#include <OgreOverlaySystem.h>
 
 #include "../widget/scenetoolmode.hpp"
 #include "../../model/settings/usersettings.hpp"
diff --git a/apps/opencs/view/render/textoverlay.cpp b/apps/opencs/view/render/textoverlay.cpp
index 377810ef4..34518951b 100644
--- a/apps/opencs/view/render/textoverlay.cpp
+++ b/apps/opencs/view/render/textoverlay.cpp
@@ -4,10 +4,10 @@
 #include <OgreMaterialManager.h>
 #include <OgreTechnique.h>
 
-#include <Overlay/OgreOverlayManager.h>
-#include <Overlay/OgreOverlayContainer.h>
-#include <Overlay/OgreFontManager.h>
-#include <Overlay/OgreTextAreaOverlayElement.h>
+#include <OgreOverlayManager.h>
+#include <OgreOverlayContainer.h>
+#include <OgreFontManager.h>
+#include <OgreTextAreaOverlayElement.h>
 #include <OgreEntity.h>
 #include <OgreViewport.h>
 #include <OgreRoot.h>
@@ -19,7 +19,6 @@ namespace CSVRender
 // Things to do:
 // - configurable font size in pixels (automatically calulate everything else from it)
 // - configurable texture to use
-// - configurable toggle key to enable/disable the text overlays (currntly fixed 'm')
 // - try material script
 // - decide whether to use QPaint
 
diff --git a/apps/opencs/view/render/textoverlay.hpp b/apps/opencs/view/render/textoverlay.hpp
index 30a5e3524..a4f043538 100644
--- a/apps/opencs/view/render/textoverlay.hpp
+++ b/apps/opencs/view/render/textoverlay.hpp
@@ -4,7 +4,7 @@
 #include <QRect>
 
 #include <OgreString.h>
-#include <Overlay/OgreFont.h>
+#include <OgreFont.h>
 
 namespace Ogre
 {