diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-05-09 10:12:33 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-05-09 14:35:34 +0300 |
| commit | c69fae99a561a04cac79d2931b43e53892167a0e (patch) | |
| tree | f35707fe2a8d0b90932efa8c563cc785ac0b4e5a /platform | |
| parent | 93ab5387d920f9ecb1d460bbea8c45a76ba4b682 (diff) | |
| download | qtlocation-mapboxgl-c69fae99a561a04cac79d2931b43e53892167a0e.tar.gz | |
[build] Suppress GLFW redefining GLAPIENTRY error
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/glfw/glfw_view.cpp | 7 | ||||
| -rw-r--r-- | platform/glfw/glfw_view.hpp | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 26c946ed76..31b0b92c58 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -10,6 +10,13 @@ #include <mbgl/map/backend_scope.hpp> #include <mbgl/map/camera.hpp> +#if MBGL_USE_GLES2 +#define GLFW_INCLUDE_ES2 +#endif // MBGL_USE_GLES2 + +#define GL_GLEXT_PROTOTYPES +#include <GLFW/glfw3.h> + #include <cassert> #include <cstdlib> diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp index 09b8847ff2..77f4f64b01 100644 --- a/platform/glfw/glfw_view.hpp +++ b/platform/glfw/glfw_view.hpp @@ -7,11 +7,7 @@ #include <mbgl/util/timer.hpp> #include <mbgl/util/geometry.hpp> -#if MBGL_USE_GLES2 -#define GLFW_INCLUDE_ES2 -#endif -#define GL_GLEXT_PROTOTYPES -#include <GLFW/glfw3.h> +struct GLFWwindow; class GLFWView : public mbgl::View, public mbgl::Backend { public: |