summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2014-10-06 15:45:14 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2014-10-06 15:45:14 -0400
commit170ce422ceb20126cd7dc7b184b5edbc0685c7e7 (patch)
treebc4e7f37775a0257f18e31628404fa476e48aba0 /common
parent0f1d33f5ee29adf9b62c912339935fdde44b0b98 (diff)
downloadqtlocation-mapboxgl-170ce422ceb20126cd7dc7b184b5edbc0685c7e7.tar.gz
forward declare HeadlessDisplay in headless_view.hpp
Diffstat (limited to 'common')
-rw-r--r--common/headless_display.cpp2
-rw-r--r--common/headless_display.hpp9
-rw-r--r--common/headless_view.cpp1
-rw-r--r--common/headless_view.hpp10
4 files changed, 12 insertions, 10 deletions
diff --git a/common/headless_display.cpp b/common/headless_display.cpp
index 580d3ef587..38d123034b 100644
--- a/common/headless_display.cpp
+++ b/common/headless_display.cpp
@@ -1,4 +1,4 @@
-#include "headless_view.hpp"
+#include "headless_display.hpp"
#include <stdexcept>
diff --git a/common/headless_display.hpp b/common/headless_display.hpp
index 4fc03da083..0eb41911ee 100644
--- a/common/headless_display.hpp
+++ b/common/headless_display.hpp
@@ -1,14 +1,7 @@
#ifndef MBGL_COMMON_HEADLESS_DISPLAY
#define MBGL_COMMON_HEADLESS_DISPLAY
-#ifdef __APPLE__
-#define MBGL_USE_CGL 1
-#else
-#include <GL/glx.h>
-#define MBGL_USE_GLX 1
-#endif
-
-#include <mbgl/platform/gl.hpp>
+#include "headless_view.hpp"
namespace mbgl {
diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index 47cf3bd661..86fa445fc8 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -1,4 +1,5 @@
#include "headless_view.hpp"
+#include "headless_display.hpp"
#include <stdexcept>
diff --git a/common/headless_view.hpp b/common/headless_view.hpp
index d1b09ce700..381988ae94 100644
--- a/common/headless_view.hpp
+++ b/common/headless_view.hpp
@@ -1,12 +1,20 @@
#ifndef MBGL_COMMON_HEADLESS_VIEW
#define MBGL_COMMON_HEADLESS_VIEW
-#include "headless_display.hpp"
+#ifdef __APPLE__
+#define MBGL_USE_CGL 1
+#else
+#include <GL/glx.h>
+#define MBGL_USE_GLX 1
+#endif
#include <mbgl/map/view.hpp>
+#include <mbgl/platform/gl.hpp>
namespace mbgl {
+class HeadlessDisplay;
+
class HeadlessView : public View {
public:
HeadlessView();