diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-10-19 14:57:13 -0700 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-10-25 18:08:28 +0300 |
| commit | 9d87dc8cf17f00eb6a8aadc0612972d63dd7f6e3 (patch) | |
| tree | 27de0e27076a8b00b560c923b3b46fb6c61890cb /platform/android | |
| parent | 5fa4790fdc24622d85db5fc503bcca9fe8c40b60 (diff) | |
| download | qtlocation-mapboxgl-9d87dc8cf17f00eb6a8aadc0612972d63dd7f6e3.tar.gz | |
[core] Make the OpenGL implementation platform specific
Split the headers, so each platform includes the most appropriated
header.
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/config.cmake | 5 | ||||
| -rw-r--r-- | platform/android/mbgl/gl/gl_impl.hpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index db75b850f1..53f9b40d7f 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -74,6 +74,7 @@ macro(mbgl_platform_core) target_include_directories(mbgl-core PUBLIC platform/default + PRIVATE platform/android ) target_add_mason_package(mbgl-core PUBLIC nunicode) @@ -346,6 +347,10 @@ macro(mbgl_platform_test) platform/linux/src/headless_display_egl.cpp ) + target_include_directories(mbgl-test + PRIVATE platform/android + ) + target_compile_options(mbgl-test PRIVATE -fvisibility=hidden ) diff --git a/platform/android/mbgl/gl/gl_impl.hpp b/platform/android/mbgl/gl/gl_impl.hpp new file mode 100644 index 0000000000..b9b5d8e315 --- /dev/null +++ b/platform/android/mbgl/gl/gl_impl.hpp @@ -0,0 +1,5 @@ +#pragma once + +#define GL_GLEXT_PROTOTYPES +#include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> |