tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[all] make default_styles header-only

Browse Source
This commit is contained in:
Konstantin Käfer
2017-06-14 21:47:01 +02:00
committed by Jason Wray
parent 11952db68c
commit a5cdbb084e
7 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/glfw.cmake
View File

@@ -8,7 +8,6 @@ target_sources(mbgl-glfw
PRIVATE platform/glfw/settings_json.hpp
PRIVATE platform/glfw/settings_json.cpp
PRIVATE platform/default/mbgl/util/default_styles.hpp
PRIVATE platform/default/mbgl/util/default_styles.cpp
)
# Our GL implementation is internal to mbgl-core, which causes the GL header to

1
cmake/offline.cmake
View File

@@ -4,7 +4,6 @@ add_executable(mbgl-offline
target_sources(mbgl-offline
PRIVATE platform/default/mbgl/util/default_styles.hpp
PRIVATE platform/default/mbgl/util/default_styles.cpp
)
target_compile_options(mbgl-offline

18
platform/default/mbgl/util/default_styles.cpp
View File

@@ -1,18 +0,0 @@
#include <mbgl/util/default_styles.hpp>
namespace mbgl {
namespace util {
namespace default_styles {
const DefaultStyle streets = { "mapbox://styles/mapbox/streets-v10", "Streets", 10 };
const DefaultStyle outdoors = { "mapbox://styles/mapbox/outdoors-v10", "Outdoors", 10 };
const DefaultStyle light = { "mapbox://styles/mapbox/light-v9", "Light", 9 };
const DefaultStyle dark = { "mapbox://styles/mapbox/dark-v9", "Dark", 9 };
const DefaultStyle satellite = { "mapbox://styles/mapbox/satellite-v9", "Satellite", 9 };
const DefaultStyle satelliteStreets = { "mapbox://styles/mapbox/satellite-streets-v10", "Satellite Streets", 10 };
const DefaultStyle trafficDay = { "mapbox://styles/mapbox/traffic-day-v2", "Traffic Day", 2 };
const DefaultStyle trafficNight = { "mapbox://styles/mapbox/traffic-night-v2", "Traffic Night", 2 };
} // namespace default_styles
} // end namespace util
} // end namespace mbgl

16
platform/default/mbgl/util/default_styles.hpp
View File

@@ -13,14 +13,14 @@ struct DefaultStyle {
const unsigned currentVersion;
};
extern const DefaultStyle streets;
extern const DefaultStyle outdoors;
extern const DefaultStyle light;
extern const DefaultStyle dark;
extern const DefaultStyle satellite;
extern const DefaultStyle satelliteStreets;
extern const DefaultStyle trafficDay;
extern const DefaultStyle trafficNight;
constexpr const DefaultStyle streets = { "mapbox://styles/mapbox/streets-v10", "Streets", 10 };
constexpr const DefaultStyle outdoors = { "mapbox://styles/mapbox/outdoors-v10", "Outdoors", 10 };
constexpr const DefaultStyle light = { "mapbox://styles/mapbox/light-v9", "Light", 9 };
constexpr const DefaultStyle dark = { "mapbox://styles/mapbox/dark-v9", "Dark", 9 };
constexpr const DefaultStyle satellite = { "mapbox://styles/mapbox/satellite-v9", "Satellite", 9 };
constexpr const DefaultStyle satelliteStreets = { "mapbox://styles/mapbox/satellite-streets-v10", "Satellite Streets", 10 };
constexpr const DefaultStyle trafficDay = { "mapbox://styles/mapbox/traffic-day-v2", "Traffic Day", 2 };
constexpr const DefaultStyle trafficNight = { "mapbox://styles/mapbox/traffic-night-v2", "Traffic Night", 2 };
const DefaultStyle orderedStyles[] = {
streets, outdoors, light, dark, satellite, satelliteStreets,

1
platform/ios/config.cmake
View File

@@ -23,7 +23,6 @@ macro(mbgl_platform_core)
# Default styles
PRIVATE platform/default/mbgl/util/default_styles.hpp
PRIVATE platform/default/mbgl/util/default_styles.cpp
# Offline
PRIVATE platform/default/mbgl/storage/offline.cpp

1
platform/macos/config.cmake
View File

@@ -19,7 +19,6 @@ macro(mbgl_platform_core)
# Default styles
PRIVATE platform/default/mbgl/util/default_styles.hpp
PRIVATE platform/default/mbgl/util/default_styles.cpp
# Offline
PRIVATE platform/default/mbgl/storage/offline.cpp

1
platform/qt/qt.cmake
View File

@@ -68,7 +68,6 @@ add_library(qmapboxgl SHARED
platform/qt/src/qmapboxgl.cpp
platform/qt/src/qmapboxgl_p.hpp
platform/default/mbgl/util/default_styles.hpp
platform/default/mbgl/util/default_styles.cpp
)
# C++ app