diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common.gypi | 2 | ||||
| -rw-r--r-- | gyp/osx.gyp | 2 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 49 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 63 |
4 files changed, 88 insertions, 28 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index b3834934d3..6b7f2aea7e 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -24,7 +24,7 @@ ], 'GCC_WARN_PEDANTIC': 'YES', 'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE', - 'MACOSX_DEPLOYMENT_TARGET': '10.9', + 'MACOSX_DEPLOYMENT_TARGET': '10.10', }, }, { 'cflags_cc': [ diff --git a/gyp/osx.gyp b/gyp/osx.gyp index 8810144a80..2df9d4818d 100644 --- a/gyp/osx.gyp +++ b/gyp/osx.gyp @@ -1,6 +1,6 @@ { 'includes': [ - '../platform/osx/mapboxgl-app.gypi', + '../platform/osx/app/mapboxgl-app.gypi', '../platform/linux/mapboxgl-app.gypi', '../test/test.gypi', '../bin/render.gypi', diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 5dae54ad90..070dd55c31 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -20,6 +20,29 @@ '../platform/darwin/image.mm', '../platform/darwin/nsthread.mm', '../platform/darwin/reachability.m', + '../platform/darwin/NSException+MGLAdditions.h', + '../platform/darwin/NSString+MGLAdditions.h', + '../platform/darwin/NSString+MGLAdditions.m', + '../include/mbgl/darwin/MGLTypes.h', + '../platform/darwin/MGLTypes.m', + '../include/mbgl/darwin/MGLStyle.h', + '../platform/darwin/MGLStyle.mm', + '../include/mbgl/darwin/MGLGeometry.h', + '../platform/darwin/MGLGeometry_Private.h', + '../platform/darwin/MGLGeometry.m', + '../include/mbgl/darwin/MGLAnnotation.h', + '../include/mbgl/darwin/MGLShape.h', + '../platform/darwin/MGLShape.m', + '../include/mbgl/darwin/MGLMultiPoint.h', + '../platform/darwin/MGLMultiPoint_Private.h', + '../platform/darwin/MGLMultiPoint.mm', + '../include/mbgl/darwin/MGLOverlay.h', + '../include/mbgl/darwin/MGLPointAnnotation.h', + '../platform/darwin/MGLPointAnnotation.m', + '../include/mbgl/darwin/MGLPolyline.h', + '../platform/darwin/MGLPolyline.mm', + '../include/mbgl/darwin/MGLPolygon.h', + '../platform/darwin/MGLPolygon.mm', '../include/mbgl/ios/Mapbox.h', '../platform/ios/MGLMapboxEvents.h', '../platform/ios/MGLMapboxEvents.m', @@ -31,41 +54,19 @@ '../include/mbgl/ios/MGLAccountManager.h', '../platform/ios/MGLAccountManager_Private.h', '../platform/ios/MGLAccountManager.m', - '../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/MGLTypes.h', - '../platform/ios/MGLTypes.m', - '../include/mbgl/ios/MGLGeometry.h', - '../platform/ios/MGLGeometry.m', - '../include/mbgl/ios/MGLMultiPoint.h', - '../platform/ios/MGLMultiPoint_Private.h', - '../platform/ios/MGLMultiPoint.mm', - '../include/mbgl/ios/MGLOverlay.h', - '../include/mbgl/ios/MGLPointAnnotation.h', - '../platform/ios/MGLPointAnnotation.m', - '../include/mbgl/ios/MGLPolyline.h', - '../platform/ios/MGLPolyline.m', - '../include/mbgl/ios/MGLPolygon.h', - '../platform/ios/MGLPolygon.m', - '../include/mbgl/ios/MGLShape.h', - '../platform/ios/MGLShape.m', '../include/mbgl/ios/MGLAnnotationImage.h', '../platform/ios/MGLAnnotationImage.m', - '../include/mbgl/ios/MGLStyle.h', - '../platform/ios/MGLStyle.mm', '../platform/ios/MGLCategoryLoader.h', '../platform/ios/MGLCategoryLoader.m', '../platform/ios/NSBundle+MGLAdditions.h', '../platform/ios/NSBundle+MGLAdditions.m', - '../platform/ios/NSException+MGLAdditions.h', '../platform/ios/NSProcessInfo+MGLAdditions.h', '../platform/ios/NSProcessInfo+MGLAdditions.m', - '../platform/ios/NSString+MGLAdditions.h', - '../platform/ios/NSString+MGLAdditions.m', '../platform/ios/vendor/SMCalloutView/SMCalloutView.h', '../platform/ios/vendor/SMCalloutView/SMCalloutView.m', '../platform/ios/vendor/Fabric/FABAttributes.h', @@ -96,6 +97,8 @@ }, 'include_dirs': [ + '../include/mbgl/ios', + '../include/mbgl/darwin', '../include', '../src', ], @@ -115,6 +118,8 @@ 'direct_dependent_settings': { 'include_dirs': [ + '../include/mbgl/ios', + '../include/mbgl/darwin', '../include', ], 'mac_bundle_resources': [ diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 1ccbd3d59b..1462d6e364 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -19,26 +19,76 @@ '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', '../platform/darwin/nsthread.mm', + '../platform/darwin/reachability.m', + '../platform/darwin/NSException+MGLAdditions.h', + '../platform/darwin/NSString+MGLAdditions.h', + '../platform/darwin/NSString+MGLAdditions.m', + '../include/mbgl/darwin/MGLTypes.h', + '../platform/darwin/MGLTypes.m', + '../include/mbgl/darwin/MGLStyle.h', + '../platform/darwin/MGLStyle.mm', + '../include/mbgl/darwin/MGLGeometry.h', + '../platform/darwin/MGLGeometry_Private.h', + '../platform/darwin/MGLGeometry.m', + '../include/mbgl/darwin/MGLAnnotation.h', + '../include/mbgl/darwin/MGLShape.h', + '../platform/darwin/MGLShape.m', + '../include/mbgl/darwin/MGLMultiPoint.h', + '../platform/darwin/MGLMultiPoint_Private.h', + '../platform/darwin/MGLMultiPoint.mm', + '../include/mbgl/darwin/MGLOverlay.h', + '../include/mbgl/darwin/MGLPointAnnotation.h', + '../platform/darwin/MGLPointAnnotation.m', + '../include/mbgl/darwin/MGLPolyline.h', + '../platform/darwin/MGLPolyline.mm', + '../include/mbgl/darwin/MGLPolygon.h', + '../platform/darwin/MGLPolygon.mm', + '../include/mbgl/osx/Mapbox.h', + '../include/mbgl/osx/MGLAccountManager.h', + '../platform/osx/sdk/MGLAccountManager_Private.h', + '../platform/osx/sdk/MGLAccountManager.m', + '../include/mbgl/osx/MGLMapView.h', + '../platform/osx/sdk/MGLMapView_Private.h', + '../platform/osx/sdk/MGLMapView.mm', + '../include/mbgl/osx/MGLMapView+IBAdditions.h', + '../platform/osx/sdk/MGLMapView+IBAdditions.m', + '../include/mbgl/osx/MGLMapViewDelegate.h', + '../platform/osx/sdk/MGLOpenGLLayer.h', + '../platform/osx/sdk/MGLOpenGLLayer.mm', + '../platform/osx/sdk/MGLCompassCell.h', + '../platform/osx/sdk/MGLCompassCell.m', + '../platform/osx/sdk/MGLAttributionButton.h', + '../platform/osx/sdk/MGLAttributionButton.m', + '../include/mbgl/osx/MGLAnnotationImage.h', + '../platform/osx/sdk/MGLAnnotationImage.m', + '../platform/osx/sdk/NSBundle+MGLAdditions.h', + '../platform/osx/sdk/NSBundle+MGLAdditions.m', + '../platform/osx/sdk/NSProcessInfo+MGLAdditions.h', + '../platform/osx/sdk/NSProcessInfo+MGLAdditions.m', + '../platform/osx/sdk/resources/', ], 'variables': { 'cflags_cc': [ '<@(libuv_cflags)', '<@(boost_cflags)', + '<@(variant_cflags)', ], 'libraries': [ '<@(libuv_static_libs)', ], 'ldflags': [ - '-framework Foundation', - '-framework ImageIO', - '-framework CoreServices', + '-framework Cocoa', + '-framework CoreLocation', '-framework OpenGL', - '-framework ApplicationServices', + '-framework QuartzCore', + '-framework SystemConfiguration', ], }, 'include_dirs': [ + '../include/mbgl/osx', + '../include/mbgl/darwin', '../include', '../src', ], @@ -58,8 +108,13 @@ 'direct_dependent_settings': { 'include_dirs': [ + '../include/mbgl/osx', + '../include/mbgl/darwin', '../include', ], + 'mac_bundle_resources': [ + '<!@(find ../platform/osx/sdk/resources -type f \! -name "README")', + ], }, }, ], |