diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 15:17:51 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 20:58:51 +0100 |
| commit | 117863f1114551407c481abc752f5fcfd139c878 (patch) | |
| tree | 4c408a8a3809df59fdfac1bc622ea79fbdbe611e /platform/linux | |
| parent | 3bc79e316e343d59f77811bca4ed6c594431e91c (diff) | |
| download | qtlocation-mapboxgl-117863f1114551407c481abc752f5fcfd139c878.tar.gz | |
[build] move headless rendering files to platform/default
Diffstat (limited to 'platform/linux')
| -rw-r--r-- | platform/linux/config.cmake | 9 | ||||
| -rw-r--r-- | platform/linux/src/headless_backend_egl.cpp | 4 | ||||
| -rw-r--r-- | platform/linux/src/headless_backend_glx.cpp | 4 | ||||
| -rw-r--r-- | platform/linux/src/headless_display_egl.cpp | 2 | ||||
| -rw-r--r-- | platform/linux/src/headless_display_glx.cpp | 2 |
5 files changed, 12 insertions, 9 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 312577a185..20679f53e9 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -18,7 +18,7 @@ macro(mbgl_platform_core) if(WITH_OSMESA) target_sources(mbgl-core PRIVATE platform/default/headless_backend_osmesa.cpp - PRIVATE platform/default/headless_display.cpp + PRIVATE platform/default/mbgl/gl/headless_display.cpp ) target_add_mason_package(mbgl-core PUBLIC mesa) elseif(WITH_EGL) @@ -78,8 +78,11 @@ macro(mbgl_platform_core) PRIVATE platform/default/webp_reader.cpp # Headless view - PRIVATE platform/default/headless_backend.cpp - PRIVATE platform/default/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.hpp + PRIVATE platform/default/mbgl/gl/headless_display.hpp + PRIVATE platform/default/mbgl/gl/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/offscreen_view.hpp # Thread pool PRIVATE platform/default/mbgl/util/default_thread_pool.cpp diff --git a/platform/linux/src/headless_backend_egl.cpp b/platform/linux/src/headless_backend_egl.cpp index 0fb33ea0e0..6288cf3805 100644 --- a/platform/linux/src/headless_backend_egl.cpp +++ b/platform/linux/src/headless_backend_egl.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/platform/log.hpp> diff --git a/platform/linux/src/headless_backend_glx.cpp b/platform/linux/src/headless_backend_glx.cpp index e1ea9cef15..79e3fe1390 100644 --- a/platform/linux/src/headless_backend_glx.cpp +++ b/platform/linux/src/headless_backend_glx.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/platform/log.hpp> diff --git a/platform/linux/src/headless_display_egl.cpp b/platform/linux/src/headless_display_egl.cpp index 4be519cfcd..95c2ebb6a6 100644 --- a/platform/linux/src/headless_display_egl.cpp +++ b/platform/linux/src/headless_display_egl.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/util/string.hpp> diff --git a/platform/linux/src/headless_display_glx.cpp b/platform/linux/src/headless_display_glx.cpp index 2023d4dcd2..4275ebb646 100644 --- a/platform/linux/src/headless_display_glx.cpp +++ b/platform/linux/src/headless_display_glx.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_display.hpp> #include <GL/glx.h> |