summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-03-22 12:25:10 -0700
committerJustin R. Miller <incanus@codesorcery.net>2015-03-22 12:25:10 -0700
commit0e2d6c8277d259792980ceba22b6560f7a68f340 (patch)
tree43e14f9facfb609dc6367216d27e9cfc5b71874d
parenteded1d90aa4fa607bb5bd804a9da2cdc690aa16d (diff)
downloadqtlocation-mapboxgl-0e2d6c8277d259792980ceba22b6560f7a68f340.tar.gz
fixes #1053: umbrella Cocoa header
-rw-r--r--gyp/platform-ios.gypi1
-rw-r--r--include/mbgl/ios/MapboxGL.h7
-rw-r--r--ios/app/MBXViewController.mm2
3 files changed, 9 insertions, 1 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index cc436561fd..a02a96eb17 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -16,6 +16,7 @@
'../platform/darwin/asset_root.mm',
'../platform/darwin/image.mm',
'../platform/darwin/reachability.m',
+ '../include/mbgl/ios/MapboxGL.h',
'../include/mbgl/ios/MGLMapView.h',
'../platform/ios/MGLMapView.mm',
'../include/mbgl/ios/MGLAnnotation.h',
diff --git a/include/mbgl/ios/MapboxGL.h b/include/mbgl/ios/MapboxGL.h
new file mode 100644
index 0000000000..237d493f31
--- /dev/null
+++ b/include/mbgl/ios/MapboxGL.h
@@ -0,0 +1,7 @@
+#import "MGLAnnotation.h"
+#import "MGLMapView.h"
+#import "MGLStyleFunctionValue.h"
+#import "MGLTypes.h"
+#import "NSArray+MGLAdditions.h"
+#import "NSDictionary+MGLAdditions.h"
+#import "UIColor+MGLAdditions.h"
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index e12964ac98..5286c71908 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -1,6 +1,6 @@
#import "MBXViewController.h"
-#import <mbgl/ios/MGLMapView.h>
+#import <mbgl/ios/MapboxGL.h>
#import <mbgl/platform/darwin/settings_nsuserdefaults.hpp>