diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2015-03-26 10:35:34 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2015-03-26 10:35:34 -0700 |
| commit | 501f9701cd25c004b496dbdf96c8ac45845718be (patch) | |
| tree | b4fd2737c58a6b697484854e46ff2ac021a010cd /gyp | |
| parent | 6d5be56b36b56a906a5ef4c9203e894e77d5b16d (diff) | |
| parent | de9255f002637b5cee9539b8cd211b1667cfc237 (diff) | |
| download | qtlocation-mapboxgl-501f9701cd25c004b496dbdf96c8ac45845718be.tar.gz | |
Merge pull request #1105 from mapbox/1099-gyp-deps
Enable modules in iOS demo app
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/platform-ios.gypi | 6 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index cb50e8b44a..020186734f 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -52,16 +52,13 @@ '<@(uv_static_libs)', ], 'ldflags': [ - '-framework CoreGraphics', '-framework CoreLocation', '-framework CoreTelephony', - '-framework ImageIO', '-framework GLKit', + '-framework ImageIO', '-framework MobileCoreServices', - '-framework OpenGLES', '-framework QuartzCore', '-framework SystemConfiguration', - '-framework UIKit', ], }, @@ -72,6 +69,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': { |