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 | |
| 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.
| -rw-r--r-- | cmake/glfw.cmake | 1 | ||||
| -rw-r--r-- | cmake/offline.cmake | 4 | ||||
| -rw-r--r-- | include/mbgl/util/default_styles.hpp (renamed from platform/default/include/mbgl/util/default_styles.hpp) | 0 | ||||
| -rw-r--r-- | platform/ios/core-files.json | 3 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 1 | ||||
| -rw-r--r-- | src/core-files.json | 1 |
6 files changed, 2 insertions, 8 deletions
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index b9ed13af28..89a7768ad3 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -12,7 +12,6 @@ target_sources(mbgl-glfw PRIVATE platform/glfw/glfw_renderer_frontend.cpp PRIVATE platform/glfw/settings_json.hpp PRIVATE platform/glfw/settings_json.cpp - PRIVATE platform/default/include/mbgl/util/default_styles.hpp ) target_include_directories(mbgl-glfw diff --git a/cmake/offline.cmake b/cmake/offline.cmake index 1f5cc60f70..5a6d4e04cb 100644 --- a/cmake/offline.cmake +++ b/cmake/offline.cmake @@ -2,10 +2,6 @@ add_executable(mbgl-offline bin/offline.cpp ) -target_sources(mbgl-offline - PRIVATE platform/default/include/mbgl/util/default_styles.hpp -) - target_include_directories(mbgl-offline PRIVATE platform/default/include ) diff --git a/platform/default/include/mbgl/util/default_styles.hpp b/include/mbgl/util/default_styles.hpp index 335d3ea5f9..335d3ea5f9 100644 --- a/platform/default/include/mbgl/util/default_styles.hpp +++ b/include/mbgl/util/default_styles.hpp 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 diff --git a/src/core-files.json b/src/core-files.json index 9453e504bb..f4f2dd2c40 100644 --- a/src/core-files.json +++ b/src/core-files.json @@ -463,6 +463,7 @@ "mbgl/util/compression.hpp": "include/mbgl/util/compression.hpp", "mbgl/util/constants.hpp": "include/mbgl/util/constants.hpp", "mbgl/util/convert.hpp": "include/mbgl/util/convert.hpp", + "mbgl/util/default_styles.hpp": "include/mbgl/util/default_styles.hpp", "mbgl/util/enum.hpp": "include/mbgl/util/enum.hpp", "mbgl/util/event.hpp": "include/mbgl/util/event.hpp", "mbgl/util/exception.hpp": "include/mbgl/util/exception.hpp", |