diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-07-23 17:39:03 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-17 12:28:55 +0300 |
| commit | d424850257cc5e747c9d9525ef8a8a4de3df2f90 (patch) | |
| tree | a9d0145627552a3532fdd0bc72f0e60497fdb3cb /platform | |
| parent | 8ee6cfa8fb022a7319ce83e795f4ff0d7e747ad7 (diff) | |
| download | qtlocation-mapboxgl-d424850257cc5e747c9d9525ef8a8a4de3df2f90.tar.gz | |
[build] Make the default styles part of GL Native
The reason is applications using it, like GLFW, don't need
to depend on code inside platform/default.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/default/include/mbgl/util/default_styles.hpp | 30 | ||||
| -rw-r--r-- | platform/ios/core-files.json | 3 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 1 |
3 files changed, 1 insertions, 33 deletions
diff --git a/platform/default/include/mbgl/util/default_styles.hpp b/platform/default/include/mbgl/util/default_styles.hpp deleted file mode 100644 index 335d3ea5f9..0000000000 --- a/platform/default/include/mbgl/util/default_styles.hpp +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include <vector> -#include <string> - -namespace mbgl { -namespace util { -namespace default_styles { - -struct DefaultStyle { - const char* url; - const char* name; - const unsigned currentVersion; -}; - -constexpr const DefaultStyle streets = { "mapbox://styles/mapbox/streets-v11", "Streets", 11 }; -constexpr const DefaultStyle outdoors = { "mapbox://styles/mapbox/outdoors-v11", "Outdoors", 11 }; -constexpr const DefaultStyle light = { "mapbox://styles/mapbox/light-v10", "Light", 10 }; -constexpr const DefaultStyle dark = { "mapbox://styles/mapbox/dark-v10", "Dark", 10 }; -constexpr const DefaultStyle satellite = { "mapbox://styles/mapbox/satellite-v9", "Satellite", 9 }; -constexpr const DefaultStyle satelliteStreets = { "mapbox://styles/mapbox/satellite-streets-v11", "Satellite Streets", 11 }; - -const DefaultStyle orderedStyles[] = { - streets, outdoors, light, dark, satellite, satelliteStreets, -}; -const size_t numOrderedStyles = sizeof(orderedStyles) / sizeof(DefaultStyle); - -} // end namespace default_styles -} // end namespace util -} // end namespace mbgl diff --git a/platform/ios/core-files.json b/platform/ios/core-files.json index 93fdfc80b9..67edda9733 100644 --- a/platform/ios/core-files.json +++ b/platform/ios/core-files.json @@ -25,8 +25,7 @@ "mbgl/gfx/headless_backend.hpp": "platform/default/include/mbgl/gfx/headless_backend.hpp", "mbgl/gfx/headless_frontend.hpp": "platform/default/include/mbgl/gfx/headless_frontend.hpp", "mbgl/gl/headless_backend.hpp": "platform/default/include/mbgl/gl/headless_backend.hpp", - "mbgl/map/map_snapshotter.hpp": "platform/default/include/mbgl/map/map_snapshotter.hpp", - "mbgl/util/default_styles.hpp": "platform/default/include/mbgl/util/default_styles.hpp" + "mbgl/map/map_snapshotter.hpp": "platform/default/include/mbgl/map/map_snapshotter.hpp" }, "private_headers": { "CFHandle.hpp": "platform/darwin/src/CFHandle.hpp" diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 33acb7a030..5d9886a047 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -75,7 +75,6 @@ add_library(qmapboxgl SHARED platform/qt/src/qmapboxgl_renderer_backend.hpp platform/qt/src/qmapboxgl_scheduler.cpp platform/qt/src/qmapboxgl_scheduler.hpp - platform/default/include/mbgl/util/default_styles.hpp ) target_include_directories(qmapboxgl |