diff options
-rw-r--r-- | cmake/core-files.cmake | 3 | ||||
-rw-r--r-- | include/mbgl/mbgl.hpp | 4 | ||||
-rw-r--r-- | platform/darwin/src/MGLSource_Private.h | 1 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyle.mm | 1 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyle_Private.h | 1 | ||||
-rw-r--r-- | platform/darwin/src/NSDate+MGLAdditions.h | 1 | ||||
-rw-r--r-- | platform/glfw/glfw_view.hpp | 3 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView_Private.h | 2 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView.mm | 2 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView_Private.h | 2 |
11 files changed, 6 insertions, 16 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 6343b5efc5..753e105ef5 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -123,9 +123,6 @@ set(MBGL_CORE_FILES include/mbgl/math/wrap.hpp src/mbgl/math/log2.cpp - # mbgl - include/mbgl/mbgl.hpp - # parsedate src/parsedate/parsedate.c src/parsedate/parsedate.h diff --git a/include/mbgl/mbgl.hpp b/include/mbgl/mbgl.hpp deleted file mode 100644 index 5cfc9cb45f..0000000000 --- a/include/mbgl/mbgl.hpp +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "map/map.hpp" -#include "map/view.hpp" diff --git a/platform/darwin/src/MGLSource_Private.h b/platform/darwin/src/MGLSource_Private.h index dff230ede5..954dd5ae38 100644 --- a/platform/darwin/src/MGLSource_Private.h +++ b/platform/darwin/src/MGLSource_Private.h @@ -1,6 +1,5 @@ #import "MGLSource.h" -#include <mbgl/mbgl.hpp> #include <mbgl/style/source.hpp> @class MGLMapView; diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index 2deaf794e8..20c1917065 100644 --- a/platform/darwin/src/MGLStyle.mm +++ b/platform/darwin/src/MGLStyle.mm @@ -31,7 +31,6 @@ #include <mbgl/style/sources/geojson_source.hpp> #include <mbgl/style/sources/vector_source.hpp> #include <mbgl/style/sources/raster_source.hpp> -#include <mbgl/mbgl.hpp> #if TARGET_OS_IPHONE #import "UIImage+MGLAdditions.h" diff --git a/platform/darwin/src/MGLStyle_Private.h b/platform/darwin/src/MGLStyle_Private.h index 46291b37b9..6f52b67fa7 100644 --- a/platform/darwin/src/MGLStyle_Private.h +++ b/platform/darwin/src/MGLStyle_Private.h @@ -3,7 +3,6 @@ #import "MGLStyleLayer.h" #import "MGLFillStyleLayer.h" #import <mbgl/util/default_styles.hpp> -#include <mbgl/mbgl.hpp> @interface MGLStyle (Private) @property (nonatomic, weak) MGLMapView *mapView; diff --git a/platform/darwin/src/NSDate+MGLAdditions.h b/platform/darwin/src/NSDate+MGLAdditions.h index a116ef32de..918aae233f 100644 --- a/platform/darwin/src/NSDate+MGLAdditions.h +++ b/platform/darwin/src/NSDate+MGLAdditions.h @@ -1,6 +1,5 @@ #import <Foundation/Foundation.h> -#include <mbgl/mbgl.hpp> #include <mbgl/util/chrono.hpp> @interface NSDate (MGLAdditions) diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp index c640f188f9..672fa2e13c 100644 --- a/platform/glfw/glfw_view.hpp +++ b/platform/glfw/glfw_view.hpp @@ -1,6 +1,7 @@ #pragma once -#include <mbgl/mbgl.hpp> +#include <mbgl/map/map.hpp> +#include <mbgl/map/view.hpp> #include <mbgl/map/backend.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/util/timer.hpp> diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 98a1f768f7..bff17fa0ea 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -7,7 +7,7 @@ #import <GLKit/GLKit.h> #import <OpenGLES/EAGL.h> -#include <mbgl/mbgl.hpp> +#include <mbgl/map/view.hpp> #include <mbgl/annotation/annotation.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/map/camera.hpp> diff --git a/platform/ios/src/MGLMapView_Private.h b/platform/ios/src/MGLMapView_Private.h index 5c74ba6dc8..6b6a898f93 100644 --- a/platform/ios/src/MGLMapView_Private.h +++ b/platform/ios/src/MGLMapView_Private.h @@ -1,6 +1,6 @@ #import <Mapbox/Mapbox.h> -#include <mbgl/mbgl.hpp> +#import <mbgl/map/map.hpp> /// Minimum size of an annotation’s accessibility element. extern const CGSize MGLAnnotationAccessibilityElementMinimumSize; diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 0feaa3d306..6442d73c71 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -18,7 +18,7 @@ #import "MGLAnnotationImage.h" #import "MGLMapViewDelegate.h" -#import <mbgl/mbgl.hpp> +#import <mbgl/map/view.hpp> #import <mbgl/annotation/annotation.hpp> #import <mbgl/map/camera.hpp> #import <mbgl/storage/reachability.h> diff --git a/platform/macos/src/MGLMapView_Private.h b/platform/macos/src/MGLMapView_Private.h index 2d9fc52a62..cf813e0bf7 100644 --- a/platform/macos/src/MGLMapView_Private.h +++ b/platform/macos/src/MGLMapView_Private.h @@ -1,6 +1,6 @@ #import "MGLMapView.h" -#import <mbgl/mbgl.hpp> +#include <mbgl/map/map.hpp> @interface MGLMapView (Private) |