From 0c1d76279049155fa9f6d3f1a44fa28585091e2f Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Fri, 23 Jan 2015 15:37:32 +0100
Subject: [PATCH 1/3] Fix build when using new boost with Ogre.

This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0
---
 apps/launcher/graphicspage.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index da4cb9fb331..a96d9b73292 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -3,8 +3,10 @@
 
 #include <QWidget>
 
+#ifndef Q_MOC_RUN
 #include <OgreRoot.h>
 #include <OgreRenderSystem.h>
+#endif
 
 #include <components/ogreinit/ogreinit.hpp>
 

From 7a903b7100d85838033177a5b15520f9afd146d2 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Fri, 23 Jan 2015 16:05:36 +0100
Subject: [PATCH 2/3] Doing forward declaration instead

---
 apps/launcher/graphicspage.hpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index a96d9b73292..213b6bccb4b 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -3,16 +3,11 @@
 
 #include <QWidget>
 
-#ifndef Q_MOC_RUN
-#include <OgreRoot.h>
-#include <OgreRenderSystem.h>
-#endif
-
 #include <components/ogreinit/ogreinit.hpp>
 
-
 #include "ui_graphicspage.h"
 
+namespace Ogre { class Root; class RenderSystem; }
 
 namespace Files { struct ConfigurationManager; }
 

From 942cf26eeed3b92cb7ee5c7dccee35fc6fe4c8e0 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Fri, 23 Jan 2015 16:06:19 +0100
Subject: [PATCH 3/3] And the missing includes

---
 apps/launcher/graphicspage.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index da707b0056d..1f85bb5e7bc 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -12,6 +12,9 @@
 
 #include <SDL.h>
 
+#include <OgreRoot.h>
+#include <OgreRenderSystem.h>
+
 #include <boost/math/common_factor.hpp>
 
 #include <components/files/configurationmanager.hpp>