diff options
author | Julian Rex <julian.rex@mapbox.com> | 2019-09-27 13:09:13 -0400 |
---|---|---|
committer | Julian Rex <julian.rex@mapbox.com> | 2019-09-27 13:09:13 -0400 |
commit | 7d5006ddcf99eddd4a399b27a1e691deaf3c80b1 (patch) | |
tree | 7f9fa45eee7f75c0de1164c8edf08d86ae1d8b6a /src/mbgl/style/layers | |
parent | 9c02ac377f49e0271c11daa69863dad1b094529e (diff) | |
download | qtlocation-mapboxgl-upstream/jrex/fix-ci-target-dont-link-twice.tar.gz |
[ios] Update ejs files.upstream/jrex/fix-ci-target-dont-link-twice
Diffstat (limited to 'src/mbgl/style/layers')
10 files changed, 9 insertions, 10 deletions
diff --git a/src/mbgl/style/layers/background_layer_properties.hpp b/src/mbgl/style/layers/background_layer_properties.hpp index 11328f78bb..ffd64ad938 100644 --- a/src/mbgl/style/layers/background_layer_properties.hpp +++ b/src/mbgl/style/layers/background_layer_properties.hpp @@ -34,7 +34,7 @@ class BackgroundPaintProperties : public Properties< BackgroundPattern > {}; -class BackgroundLayerProperties final : public LayerProperties { +class MBGL_EXPORT BackgroundLayerProperties final : public LayerProperties { public: explicit BackgroundLayerProperties(Immutable<BackgroundLayer::Impl>); BackgroundLayerProperties( diff --git a/src/mbgl/style/layers/circle_layer_properties.hpp b/src/mbgl/style/layers/circle_layer_properties.hpp index a5f7a584df..701a59305c 100644 --- a/src/mbgl/style/layers/circle_layer_properties.hpp +++ b/src/mbgl/style/layers/circle_layer_properties.hpp @@ -74,7 +74,7 @@ class CirclePaintProperties : public Properties< CircleTranslateAnchor > {}; -class CircleLayerProperties final : public LayerProperties { +class MBGL_EXPORT CircleLayerProperties final : public LayerProperties { public: explicit CircleLayerProperties(Immutable<CircleLayer::Impl>); CircleLayerProperties( diff --git a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp index 6936d5e0c4..9c24801d77 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp @@ -59,7 +59,7 @@ class FillExtrusionPaintProperties : public Properties< FillExtrusionVerticalGradient > {}; -class FillExtrusionLayerProperties final : public LayerProperties { +class MBGL_EXPORT FillExtrusionLayerProperties final : public LayerProperties { public: explicit FillExtrusionLayerProperties(Immutable<FillExtrusionLayer::Impl>); FillExtrusionLayerProperties( diff --git a/src/mbgl/style/layers/fill_layer_properties.hpp b/src/mbgl/style/layers/fill_layer_properties.hpp index 38ca506199..4fbb55e661 100644 --- a/src/mbgl/style/layers/fill_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_layer_properties.hpp @@ -54,7 +54,7 @@ class FillPaintProperties : public Properties< FillTranslateAnchor > {}; -class FillLayerProperties final : public LayerProperties { +class MBGL_EXPORT FillLayerProperties final : public LayerProperties { public: explicit FillLayerProperties(Immutable<FillLayer::Impl>); FillLayerProperties( diff --git a/src/mbgl/style/layers/heatmap_layer_properties.hpp b/src/mbgl/style/layers/heatmap_layer_properties.hpp index 089560276d..358ebda9fc 100644 --- a/src/mbgl/style/layers/heatmap_layer_properties.hpp +++ b/src/mbgl/style/layers/heatmap_layer_properties.hpp @@ -43,7 +43,7 @@ class HeatmapPaintProperties : public Properties< HeatmapWeight > {}; -class HeatmapLayerProperties final : public LayerProperties { +class MBGL_EXPORT HeatmapLayerProperties final : public LayerProperties { public: explicit HeatmapLayerProperties(Immutable<HeatmapLayer::Impl>); HeatmapLayerProperties( diff --git a/src/mbgl/style/layers/hillshade_layer_properties.hpp b/src/mbgl/style/layers/hillshade_layer_properties.hpp index 745749b198..d5944484ab 100644 --- a/src/mbgl/style/layers/hillshade_layer_properties.hpp +++ b/src/mbgl/style/layers/hillshade_layer_properties.hpp @@ -49,7 +49,7 @@ class HillshadePaintProperties : public Properties< HillshadeShadowColor > {}; -class HillshadeLayerProperties final : public LayerProperties { +class MBGL_EXPORT HillshadeLayerProperties final : public LayerProperties { public: explicit HillshadeLayerProperties(Immutable<HillshadeLayer::Impl>); HillshadeLayerProperties( diff --git a/src/mbgl/style/layers/layer_properties.hpp.ejs b/src/mbgl/style/layers/layer_properties.hpp.ejs index af67f14b90..ce1e0c4049 100644 --- a/src/mbgl/style/layers/layer_properties.hpp.ejs +++ b/src/mbgl/style/layers/layer_properties.hpp.ejs @@ -63,7 +63,7 @@ class <%- camelize(type) %>PaintProperties : public Properties< <%- camelize(paintProperties.slice(-1)[0].name) %> > {}; -class <%- camelize(type) %>LayerProperties final : public LayerProperties { +class MBGL_EXPORT <%- camelize(type) %>LayerProperties final : public LayerProperties { public: explicit <%- camelize(type) %>LayerProperties(Immutable<<%- camelize(type) %>Layer::Impl>); <%- camelize(type) %>LayerProperties( diff --git a/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp index 2ecbb10993..26e792d4a6 100644 --- a/src/mbgl/style/layers/line_layer_properties.hpp +++ b/src/mbgl/style/layers/line_layer_properties.hpp @@ -106,7 +106,7 @@ class LinePaintProperties : public Properties< LineWidth > {}; -class LineLayerProperties final : public LayerProperties { +class MBGL_EXPORT LineLayerProperties final : public LayerProperties { public: explicit LineLayerProperties(Immutable<LineLayer::Impl>); LineLayerProperties( diff --git a/src/mbgl/style/layers/raster_layer_properties.hpp b/src/mbgl/style/layers/raster_layer_properties.hpp index 889e24f041..5481e5b4d3 100644 --- a/src/mbgl/style/layers/raster_layer_properties.hpp +++ b/src/mbgl/style/layers/raster_layer_properties.hpp @@ -59,7 +59,7 @@ class RasterPaintProperties : public Properties< RasterSaturation > {}; -class RasterLayerProperties final : public LayerProperties { +class MBGL_EXPORT RasterLayerProperties final : public LayerProperties { public: explicit RasterLayerProperties(Immutable<RasterLayer::Impl>); RasterLayerProperties( diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index a0393c4359..ee897f14fd 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -12,7 +12,6 @@ #include <mbgl/style/properties.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> -#include <mbgl/util/util.hpp> namespace mbgl { namespace style { |