summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2014-02-03 21:57:46 +0000
committerDane Springmeyer <dane@mapbox.com>2014-02-03 21:57:46 +0000
commitf1e74215fdb3e72208ba50fa296b4eb1eaccf8c1 (patch)
treefb84245a03f29f73e6223e77f416086fc1ea49da
parent9ab9eeec1334f5556c04f944dda07abe58ed0f45 (diff)
downloadqtlocation-mapboxgl-f1e74215fdb3e72208ba50fa296b4eb1eaccf8c1.tar.gz
compile fixes on ubuntu precise/g++-4.8 - refs #27
-rw-r--r--include/llmr/geometry/debug_font_buffer.hpp1
-rw-r--r--include/llmr/geometry/fill_buffer.hpp1
-rw-r--r--include/llmr/geometry/line_buffer.hpp2
-rw-r--r--include/llmr/geometry/vertex_buffer.hpp2
-rw-r--r--include/llmr/map/vector_tile.hpp1
-rw-r--r--include/llmr/platform/gl.hpp5
-rw-r--r--include/llmr/renderer/fill_bucket.hpp1
-rw-r--r--include/llmr/renderer/line_bucket.hpp2
-rw-r--r--include/llmr/style/properties.hpp1
-rw-r--r--include/llmr/util/vec.hpp1
-rw-r--r--src/geometry/debug_font_buffer.cpp1
-rw-r--r--src/map/map.cpp2
-rw-r--r--src/map/vector_tile.cpp2
-rw-r--r--src/renderer/painter.cpp1
14 files changed, 17 insertions, 6 deletions
diff --git a/include/llmr/geometry/debug_font_buffer.hpp b/include/llmr/geometry/debug_font_buffer.hpp
index fe03297fbc..28a50d372e 100644
--- a/include/llmr/geometry/debug_font_buffer.hpp
+++ b/include/llmr/geometry/debug_font_buffer.hpp
@@ -2,6 +2,7 @@
#define LLMR_GEOMETRY_DEBUG_FONT_BUFFER
#include <vector>
+#include <cstdint>
namespace llmr {
diff --git a/include/llmr/geometry/fill_buffer.hpp b/include/llmr/geometry/fill_buffer.hpp
index c46fed1d13..626d66179b 100644
--- a/include/llmr/geometry/fill_buffer.hpp
+++ b/include/llmr/geometry/fill_buffer.hpp
@@ -2,6 +2,7 @@
#define LLMR_GEOMETRY_FILL_BUFFER
#include <vector>
+#include <cstdint>
namespace llmr {
diff --git a/include/llmr/geometry/line_buffer.hpp b/include/llmr/geometry/line_buffer.hpp
index 3073ef22f3..4965a919ae 100644
--- a/include/llmr/geometry/line_buffer.hpp
+++ b/include/llmr/geometry/line_buffer.hpp
@@ -2,7 +2,7 @@
#define LLMR_GEOMETRY_LINE_BUFFER
#include <vector>
-
+#include <cstdint>
#include <cmath>
namespace llmr {
diff --git a/include/llmr/geometry/vertex_buffer.hpp b/include/llmr/geometry/vertex_buffer.hpp
index b4c31e4191..667e3fc8a3 100644
--- a/include/llmr/geometry/vertex_buffer.hpp
+++ b/include/llmr/geometry/vertex_buffer.hpp
@@ -2,7 +2,7 @@
#define LLMR_GEOMETRY_VERTEX_BUFFER
#include <vector>
-
+#include <cstdint>
#include <cmath>
namespace llmr {
diff --git a/include/llmr/map/vector_tile.hpp b/include/llmr/map/vector_tile.hpp
index cf3fbdc248..3597906c4d 100644
--- a/include/llmr/map/vector_tile.hpp
+++ b/include/llmr/map/vector_tile.hpp
@@ -6,6 +6,7 @@
#include <vector>
#include <map>
#include <set>
+#include <limits>
namespace llmr {
diff --git a/include/llmr/platform/gl.hpp b/include/llmr/platform/gl.hpp
index fb36b5b794..a86113d7fb 100644
--- a/include/llmr/platform/gl.hpp
+++ b/include/llmr/platform/gl.hpp
@@ -18,7 +18,10 @@
#error Unsupported Apple platform
#endif
#else
- #error Unsupported platform
+ #define GL_GLEXT_PROTOTYPES
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+ #include <GL/glext.h>
#endif
#endif
diff --git a/include/llmr/renderer/fill_bucket.hpp b/include/llmr/renderer/fill_bucket.hpp
index bf1dd47cb4..4ab9507310 100644
--- a/include/llmr/renderer/fill_bucket.hpp
+++ b/include/llmr/renderer/fill_bucket.hpp
@@ -5,6 +5,7 @@
#include <llmr/style/bucket_description.hpp>
#include <vector>
+#include <memory>
namespace llmr {
diff --git a/include/llmr/renderer/line_bucket.hpp b/include/llmr/renderer/line_bucket.hpp
index 4c75fd38f6..f6caededa4 100644
--- a/include/llmr/renderer/line_bucket.hpp
+++ b/include/llmr/renderer/line_bucket.hpp
@@ -3,7 +3,7 @@
#include "bucket.hpp"
#include <llmr/style/bucket_description.hpp>
-
+#include <memory>
#include <vector>
namespace llmr {
diff --git a/include/llmr/style/properties.hpp b/include/llmr/style/properties.hpp
index 572ca61acd..4d4ce68952 100644
--- a/include/llmr/style/properties.hpp
+++ b/include/llmr/style/properties.hpp
@@ -4,6 +4,7 @@
#include <array>
#include <vector>
#include <string>
+#include <limits>
namespace llmr {
diff --git a/include/llmr/util/vec.hpp b/include/llmr/util/vec.hpp
index 760b66753e..f403cded5c 100644
--- a/include/llmr/util/vec.hpp
+++ b/include/llmr/util/vec.hpp
@@ -2,6 +2,7 @@
#define llmr_util_vec2_
#include <limits>
+#include <type_traits>
namespace llmr {
diff --git a/src/geometry/debug_font_buffer.cpp b/src/geometry/debug_font_buffer.cpp
index d789df815d..ba180ff602 100644
--- a/src/geometry/debug_font_buffer.cpp
+++ b/src/geometry/debug_font_buffer.cpp
@@ -1,6 +1,7 @@
#include <llmr/geometry/debug_font_buffer.hpp>
#include <llmr/platform/gl.hpp>
#include <cmath>
+#include <cstring>
#include "debug_font.cpp"
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 341f7f7197..1e2326ff33 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -7,7 +7,7 @@
#include <iostream>
#include <thread>
-
+#include <algorithm>
#include <cmath>
#include <cassert>
diff --git a/src/map/vector_tile.cpp b/src/map/vector_tile.cpp
index 777dd299eb..e0ea5ebbb1 100644
--- a/src/map/vector_tile.cpp
+++ b/src/map/vector_tile.cpp
@@ -1,6 +1,6 @@
#include <llmr/map/vector_tile.hpp>
#include <llmr/style/bucket_description.hpp>
-
+#include <algorithm>
using namespace llmr;
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index cb33964fc8..6114c5b213 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -15,6 +15,7 @@
#include <cmath>
#include <array>
#include <numeric>
+#include <algorithm>
using namespace llmr;