diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/platform-ios.gypi | 22 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 3 |
2 files changed, 19 insertions, 6 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index de73037eb5..9965db57ac 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -16,8 +16,22 @@ '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', '../platform/darwin/reachability.m', + '../include/mbgl/ios/MapboxGL.h', + '../include/mbgl/ios/MGLMapboxEvents.h', + '../platform/ios/MGLMapboxEvents.m', '../include/mbgl/ios/MGLMapView.h', '../platform/ios/MGLMapView.mm', + '../include/mbgl/ios/MGLAnnotation.h', + '../include/mbgl/ios/MGLUserLocation.h', + '../platform/ios/MGLUserLocation_Private.h', + '../platform/ios/MGLUserLocation.m', + '../platform/ios/MGLUserLocationAnnotationView.h', + '../platform/ios/MGLUserLocationAnnotationView.m', + '../include/mbgl/ios/MGLMetricsLocationManager.h', + '../platform/ios/MGLMetricsLocationManager.m', + '../include/mbgl/ios/MGLTypes.h', + '../platform/ios/vendor/SMCalloutView/SMCalloutView.h', + '../platform/ios/vendor/SMCalloutView/SMCalloutView.m', ], 'variables': { @@ -29,14 +43,13 @@ '<@(uv_static_libs)', ], 'ldflags': [ - '-framework CoreGraphics', '-framework CoreLocation', - '-framework ImageIO', + '-framework CoreTelephony', '-framework GLKit', + '-framework ImageIO', '-framework MobileCoreServices', - '-framework OpenGLES', + '-framework QuartzCore', '-framework SystemConfiguration', - '-framework UIKit', ], }, @@ -47,6 +60,7 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'CLANG_ENABLE_OBJC_ARC': 'YES', + 'CLANG_ENABLE_MODULES': 'YES', }, 'link_settings': { diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 39e18bb839..41a453533f 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -26,10 +26,8 @@ '<@(uv_static_libs)', ], 'ldflags': [ - '-framework Foundation', '-framework ImageIO', '-framework CoreServices', - '-framework OpenGL', '-framework ApplicationServices', ], }, @@ -42,6 +40,7 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'CLANG_ENABLE_OBJC_ARC': 'YES', + 'CLANG_ENABLE_MODULES': 'YES', }, 'link_settings': { |