diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-10-10 17:16:37 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-10-25 13:52:36 -0700 |
commit | a4d259c33f9bb890bba97fd89552720e3e0ec09b (patch) | |
tree | 342ecc27a6993c48f3a2e1d739fce890350bc44d /cmake | |
parent | 5cc390d694fc7510d445310d8eb9e32429a5e67b (diff) | |
download | qtlocation-mapboxgl-a4d259c33f9bb890bba97fd89552720e3e0ec09b.tar.gz |
[core] move gl::Context to Backend and refactor View
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/core-files.cmake | 8 | ||||
-rw-r--r-- | cmake/core.cmake | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 255d40fa50..4d5cddbc49 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -62,10 +62,12 @@ set(MBGL_CORE_FILES src/mbgl/gl/debugging.hpp src/mbgl/gl/extension.cpp src/mbgl/gl/extension.hpp + src/mbgl/gl/framebuffer.hpp src/mbgl/gl/gl.cpp src/mbgl/gl/index_buffer.hpp src/mbgl/gl/object.cpp src/mbgl/gl/object.hpp + src/mbgl/gl/renderbuffer.hpp src/mbgl/gl/shader.cpp src/mbgl/gl/shader.hpp src/mbgl/gl/state.hpp @@ -97,7 +99,6 @@ set(MBGL_CORE_FILES include/mbgl/map/camera.hpp include/mbgl/map/map.hpp include/mbgl/map/mode.hpp - include/mbgl/map/update.hpp include/mbgl/map/view.hpp src/mbgl/map/backend.cpp src/mbgl/map/change.hpp @@ -106,7 +107,7 @@ set(MBGL_CORE_FILES src/mbgl/map/transform.hpp src/mbgl/map/transform_state.cpp src/mbgl/map/transform_state.hpp - src/mbgl/map/view.cpp + src/mbgl/map/update.hpp src/mbgl/map/zoom_history.hpp # math @@ -135,8 +136,9 @@ set(MBGL_CORE_FILES include/mbgl/platform/default/glfw_view.hpp include/mbgl/platform/default/headless_backend.hpp include/mbgl/platform/default/headless_display.hpp - include/mbgl/platform/default/headless_view.hpp + include/mbgl/platform/default/offscreen_view.hpp include/mbgl/platform/default/settings_json.hpp + include/mbgl/platform/default/thread_pool.hpp # renderer src/mbgl/renderer/bucket.hpp diff --git a/cmake/core.cmake b/cmake/core.cmake index ef98c4eccb..bc5e7eb718 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -36,7 +36,7 @@ target_include_directories(mbgl-core target_add_mason_package(mbgl-core PUBLIC geometry) target_add_mason_package(mbgl-core PUBLIC variant) -target_add_mason_package(mbgl-core PRIVATE unique_resource) +target_add_mason_package(mbgl-core PUBLIC unique_resource) target_add_mason_package(mbgl-core PRIVATE rapidjson) target_add_mason_package(mbgl-core PRIVATE boost) target_add_mason_package(mbgl-core PRIVATE geojson) |