[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.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user