diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-04-28 11:48:57 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-04-28 16:16:09 +0200 |
| commit | 473aa281c7e379060c6dba60b7ba6b69c6f0bdf4 (patch) | |
| tree | 4944f4d5ae24e88ae5923f2bb749e85ab69a2436 /ios | |
| parent | e4fd967d184e94325e7696033bad0317cd14d158 (diff) | |
| download | qtlocation-mapboxgl-473aa281c7e379060c6dba60b7ba6b69c6f0bdf4.tar.gz | |
make meta-target for all iOS targets too and split up project.gyp
this will make it easier to add more targets to iOS builds in the future. It'll also help by having Xcode files named after the platform they're for, so it's easier to distinguish windows
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/app/mapboxgl-app.gypi (renamed from ios/app/mapboxgl-app.gyp) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ios/app/mapboxgl-app.gyp b/ios/app/mapboxgl-app.gypi index 0e093a1d8d..73b66dff12 100644 --- a/ios/app/mapboxgl-app.gyp +++ b/ios/app/mapboxgl-app.gypi @@ -9,18 +9,18 @@ 'product_extension': 'app', 'mac_bundle': 1, 'mac_bundle_resources': [ - '<!@(find ./img -type f)', + '<!@(find ../ios/app/img -type f)', './features.geojson', './Settings.bundle/' ], 'dependencies': [ - '../../mbgl.gyp:bundle_styles', - '../../mbgl.gyp:core', - '../../mbgl.gyp:platform-<(platform_lib)', - '../../mbgl.gyp:http-<(http_lib)', - '../../mbgl.gyp:asset-<(asset_lib)', - '../../mbgl.gyp:cache-<(cache_lib)', + '../mbgl.gyp:bundle_styles', + '../mbgl.gyp:core', + '../mbgl.gyp:platform-<(platform_lib)', + '../mbgl.gyp:http-<(http_lib)', + '../mbgl.gyp:asset-<(asset_lib)', + '../mbgl.gyp:cache-<(cache_lib)', ], 'sources': [ @@ -38,7 +38,7 @@ 'SDKROOT': 'iphoneos', 'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos', 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', - 'INFOPLIST_FILE': 'app-info.plist', + 'INFOPLIST_FILE': '../ios/app/app-info.plist', 'TARGETED_DEVICE_FAMILY': '1,2', 'COMBINE_HIDPI_IMAGES': 'NO', # don't merge @2x.png images into .tiff files 'CLANG_ENABLE_OBJC_ARC': 'YES', |