[ios] Don't link libmbgl-core twice; fix CI build that requires exposing core classes.

16 files changed, 39 insertions, 31 deletions

diff --git a/include/mbgl/storage/network_status.hpp b/include/mbgl/storage/network_status.hpp
index 0d1ae54ec4..e740df51de 100644
--- a/include/mbgl/storage/network_status.hpp
+++ b/include/mbgl/storage/network_status.hpp
@@ -3,6 +3,7 @@
 #include <atomic>
 #include <mutex>
 #include <unordered_set>
+#include <mbgl/util/util.hpp>
 
 namespace mbgl {
 
@@ -10,7 +11,7 @@ namespace util {
 class AsyncTask;
 } // namespace util
 
-class NetworkStatus {
+class MBGL_EXPORT NetworkStatus {
 public:
     enum class Status : uint8_t {
         Online,
diff --git a/include/mbgl/storage/response.hpp b/include/mbgl/storage/response.hpp
index 07b059e435..82eb9e96cf 100644
--- a/include/mbgl/storage/response.hpp
+++ b/include/mbgl/storage/response.hpp
@@ -2,13 +2,14 @@
 
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/util/optional.hpp>
+#include <mbgl/util/util.hpp>
 
 #include <string>
 #include <memory>
 
 namespace mbgl {
 
-class Response {
+class MBGL_EXPORT Response {
 public:
     Response() = default;
     Response(const Response&);
diff --git a/include/mbgl/style/expression/dsl.hpp b/include/mbgl/style/expression/dsl.hpp
index 4abeac7989..f95ad303b1 100644
--- a/include/mbgl/style/expression/dsl.hpp
+++ b/include/mbgl/style/expression/dsl.hpp
@@ -4,6 +4,7 @@
 #include <mbgl/style/expression/interpolator.hpp>
 #include <mbgl/style/expression/value.hpp>
 #include <mbgl/util/ignore.hpp>
+#include <mbgl/util/util.hpp>
 
 #include <initializer_list>
 #include <memory>
@@ -28,16 +29,16 @@ std::unique_ptr<Expression> createExpression(const char* expr);
 std::unique_ptr<Expression> createExpression(const mbgl::style::conversion::Convertible& expr);
 std::unique_ptr<Expression> error(std::string);
 
-std::unique_ptr<Expression> literal(const char* value);
-std::unique_ptr<Expression> literal(Value value);
-std::unique_ptr<Expression> literal(std::initializer_list<double> value);
-std::unique_ptr<Expression> literal(std::initializer_list<const char*> value);
+std::unique_ptr<Expression> literal(const char* value) MBGL_EXPORT;
+std::unique_ptr<Expression> literal(Value value) MBGL_EXPORT;
+std::unique_ptr<Expression> literal(std::initializer_list<double> value) MBGL_EXPORT;
+std::unique_ptr<Expression> literal(std::initializer_list<const char*> value) MBGL_EXPORT;
 
 std::unique_ptr<Expression>
 assertion(type::Type, std::unique_ptr<Expression>, 
           std::unique_ptr<Expression> def = nullptr);
 std::unique_ptr<Expression> number(std::unique_ptr<Expression>,
-                                   std::unique_ptr<Expression> def = nullptr);
+                                   std::unique_ptr<Expression> def = nullptr) MBGL_EXPORT;
 std::unique_ptr<Expression> string(std::unique_ptr<Expression>,
                                    std::unique_ptr<Expression> def = nullptr);
 std::unique_ptr<Expression> boolean(std::unique_ptr<Expression>,
@@ -46,15 +47,15 @@ std::unique_ptr<Expression> boolean(std::unique_ptr<Expression>,
 std::unique_ptr<Expression> toColor(std::unique_ptr<Expression>,
                                     std::unique_ptr<Expression> def = nullptr);
 std::unique_ptr<Expression> toString(std::unique_ptr<Expression>,
-                                     std::unique_ptr<Expression> def = nullptr);
+                                     std::unique_ptr<Expression> def = nullptr) MBGL_EXPORT;
 std::unique_ptr<Expression> toFormatted(std::unique_ptr<Expression>,
                                         std::unique_ptr<Expression> def = nullptr);
 
-std::unique_ptr<Expression> get(const char* value);
-std::unique_ptr<Expression> get(std::unique_ptr<Expression>);
+std::unique_ptr<Expression> get(const char* value) MBGL_EXPORT;
+std::unique_ptr<Expression> get(std::unique_ptr<Expression>) MBGL_EXPORT;
 
 std::unique_ptr<Expression> id();
-std::unique_ptr<Expression> zoom();
+std::unique_ptr<Expression> zoom() MBGL_EXPORT;
 
 std::unique_ptr<Expression> eq(std::unique_ptr<Expression>, std::unique_ptr<Expression>);
 std::unique_ptr<Expression> ne(std::unique_ptr<Expression>, std::unique_ptr<Expression>);
@@ -63,31 +64,31 @@ std::unique_ptr<Expression> lt(std::unique_ptr<Expression>, std::unique_ptr<Expr
 
 std::unique_ptr<Expression> step(std::unique_ptr<Expression> input,
                                  std::unique_ptr<Expression> output0,
-                                 double input1, std::unique_ptr<Expression> output1);
+                                 double input1, std::unique_ptr<Expression> output1) MBGL_EXPORT;
 
-Interpolator linear();
+Interpolator linear() MBGL_EXPORT;
 Interpolator exponential(double base);
 Interpolator cubicBezier(double x1, double y1, double x2, double y2);
 
 std::unique_ptr<Expression> interpolate(Interpolator interpolator,
                                         std::unique_ptr<Expression> input,
-                                        double input1, std::unique_ptr<Expression> output1);
+                                        double input1, std::unique_ptr<Expression> output1) MBGL_EXPORT;
 
 std::unique_ptr<Expression> interpolate(Interpolator interpolator,
                                         std::unique_ptr<Expression> input,
                                         double input1, std::unique_ptr<Expression> output1,
-                                        double input2, std::unique_ptr<Expression> output2);
+                                        double input2, std::unique_ptr<Expression> output2) MBGL_EXPORT;
 
 std::unique_ptr<Expression> interpolate(Interpolator interpolator,
                                         std::unique_ptr<Expression> input,
                                         double input1, std::unique_ptr<Expression> output1,
                                         double input2, std::unique_ptr<Expression> output2,
-                                        double input3, std::unique_ptr<Expression> output3);
+                                        double input3, std::unique_ptr<Expression> output3) MBGL_EXPORT;
 
 std::unique_ptr<Expression> concat(std::vector<std::unique_ptr<Expression>> inputs);
 
-std::unique_ptr<Expression> format(const char* value);
-std::unique_ptr<Expression> format(std::unique_ptr<Expression>);
+std::unique_ptr<Expression> format(const char* value) MBGL_EXPORT;
+std::unique_ptr<Expression> format(std::unique_ptr<Expression>) MBGL_EXPORT;
 
 } // namespace dsl
 } // namespace expression
diff --git a/include/mbgl/style/expression/formatted.hpp b/include/mbgl/style/expression/formatted.hpp
index bb3d609c91..acde3a1dd6 100644
--- a/include/mbgl/style/expression/formatted.hpp
+++ b/include/mbgl/style/expression/formatted.hpp
@@ -4,6 +4,7 @@
 #include <mbgl/util/color.hpp>
 #include <mbgl/util/font_stack.hpp>
 #include <mbgl/util/optional.hpp>
+#include <mbgl/util/util.hpp>
 
 #include <vector>
 #include <string>
@@ -33,7 +34,7 @@ struct FormattedSection {
     optional<Color> textColor;
 };
 
-class Formatted {
+class MBGL_EXPORT Formatted {
 public:
     Formatted() = default;
     
diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp
index b50ca75067..38f7ea2851 100644
--- a/include/mbgl/style/layer.hpp
+++ b/include/mbgl/style/layer.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/style/types.hpp>
 #include <mbgl/util/immutable.hpp>
 #include <mbgl/util/optional.hpp>
+#include <mbgl/util/util.hpp>
 
 #include <mapbox/weak.hpp>
 #include <mapbox/type_wrapper.hpp>
@@ -82,7 +83,7 @@ struct LayerTypeInfo {
  *
  *     auto circleLayer = LayerManager::get()->createLayer("circle", ...);
  */
-class Layer {
+class MBGL_EXPORT Layer {
 public:
     Layer(const Layer& ) = delete;
     Layer& operator=(const Layer&) = delete;
diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index ebdce35d0f..5d244e63d4 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -15,7 +15,7 @@ namespace style {
 
 class TransitionOptions;
 
-class BackgroundLayer : public Layer {
+class MBGL_EXPORT BackgroundLayer : public Layer {
 public:
     BackgroundLayer(const std::string& layerID);
     ~BackgroundLayer() final;
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index 842094f944..f9f801cce9 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -15,7 +15,7 @@ namespace style {
 
 class TransitionOptions;
 
-class CircleLayer : public Layer {
+class MBGL_EXPORT CircleLayer : public Layer {
 public:
     CircleLayer(const std::string& layerID, const std::string& sourceID);
     ~CircleLayer() final;
diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp
index 76c2359617..fb767b1c11 100644
--- a/include/mbgl/style/layers/fill_extrusion_layer.hpp
+++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp
@@ -15,7 +15,7 @@ namespace style {
 
 class TransitionOptions;
 
-class FillExtrusionLayer : public Layer {
+class MBGL_EXPORT FillExtrusionLayer : public Layer {
 public:
     FillExtrusionLayer(const std::string& layerID, const std::string& sourceID);
     ~FillExtrusionLayer() final;
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index 9ec33d7e96..48ccc91958 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -15,7 +15,7 @@ namespace style {
 
 class TransitionOptions;
 
-class FillLayer : public Layer {
+class MBGL_EXPORT FillLayer : public Layer {
 public:
     FillLayer(const std::string& layerID, const std::string& sourceID);
     ~FillLayer() final;
diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp
index 2dec03b927..f9e906b7e5 100644
--- a/include/mbgl/style/layers/heatmap_layer.hpp
+++ b/include/mbgl/style/layers/heatmap_layer.hpp
@@ -16,7 +16,7 @@ namespace style {
 
 class TransitionOptions;
 
-class HeatmapLayer : public Layer {
+class MBGL_EXPORT HeatmapLayer : public Layer {
 public:
     HeatmapLayer(const std::string& layerID, const std::string& sourceID);
     ~HeatmapLayer() final;
diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp
index 824606c29b..e4e77100a3 100644
--- a/include/mbgl/style/layers/hillshade_layer.hpp
+++ b/include/mbgl/style/layers/hillshade_layer.hpp
@@ -15,7 +15,8 @@ namespace style {
 
 class TransitionOptions;
 
-class HillshadeLayer : public Layer {
+
+class MBGL_EXPORT HillshadeLayer : public Layer {
 public:
     HillshadeLayer(const std::string& layerID, const std::string& sourceID);
     ~HillshadeLayer() final;
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index 4f2cf53708..fd3d4f6a94 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -18,7 +18,7 @@ namespace style {
 
 class TransitionOptions;
 
-class LineLayer : public Layer {
+class MBGL_EXPORT LineLayer  : public Layer {
 public:
     LineLayer(const std::string& layerID, const std::string& sourceID);
     ~LineLayer() final;
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index bff38d42ac..7b59d5cc1e 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -15,7 +15,7 @@ namespace style {
 
 class TransitionOptions;
 
-class RasterLayer : public Layer {
+class MBGL_EXPORT RasterLayer  : public Layer {
 public:
     RasterLayer(const std::string& layerID, const std::string& sourceID);
     ~RasterLayer() final;
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 92e214919a..fd487feaef 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -17,7 +17,7 @@ namespace style {
 
 class TransitionOptions;
 
-class SymbolLayer : public Layer {
+class MBGL_EXPORT SymbolLayer : public Layer {
 public:
     SymbolLayer(const std::string& layerID, const std::string& sourceID);
     ~SymbolLayer() final;
diff --git a/include/mbgl/style/light.hpp b/include/mbgl/style/light.hpp
index 7434fb2882..7c9e63ad07 100644
--- a/include/mbgl/style/light.hpp
+++ b/include/mbgl/style/light.hpp
@@ -10,13 +10,14 @@
 #include <mbgl/style/transition_options.hpp>
 #include <mbgl/style/types.hpp>
 #include <mbgl/util/immutable.hpp>
+#include <mbgl/util/util.hpp>
 
 namespace mbgl {
 namespace style {
 
 class LightObserver;
 
-class Light {
+class MBGL_EXPORT Light {
 public:
     Light();
     ~Light();
diff --git a/include/mbgl/style/property_expression.hpp b/include/mbgl/style/property_expression.hpp
index f68285fb1b..679709462b 100644
--- a/include/mbgl/style/property_expression.hpp
+++ b/include/mbgl/style/property_expression.hpp
@@ -6,11 +6,12 @@
 #include <mbgl/style/expression/step.hpp>
 #include <mbgl/style/expression/find_zoom_curve.hpp>
 #include <mbgl/util/range.hpp>
+#include <mbgl/util/util.hpp>
 
 namespace mbgl {
 namespace style {
 
-class PropertyExpressionBase {
+class MBGL_EXPORT PropertyExpressionBase {
 public:
     explicit PropertyExpressionBase(std::unique_ptr<expression::Expression>);