From 473aa281c7e379060c6dba60b7ba6b69c6f0bdf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 28 Apr 2015 11:48:57 +0200
Subject: 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
---
 ios/app/mapboxgl-app.gyp  | 63 -----------------------------------------------
 ios/app/mapboxgl-app.gypi | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 63 deletions(-)
 delete mode 100644 ios/app/mapboxgl-app.gyp
 create mode 100644 ios/app/mapboxgl-app.gypi

(limited to 'ios')

diff --git a/ios/app/mapboxgl-app.gyp b/ios/app/mapboxgl-app.gyp
deleted file mode 100644
index 0e093a1d8d..0000000000
--- a/ios/app/mapboxgl-app.gyp
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  'includes': [
-    '../../gyp/common.gypi',
-  ],
-  'targets': [
-    { 'target_name': 'iosapp',
-      'product_name': 'Mapbox GL',
-      'type': 'executable',
-      'product_extension': 'app',
-      'mac_bundle': 1,
-      'mac_bundle_resources': [
-        '<!@(find ./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)',
-      ],
-
-      'sources': [
-        './main.m',
-        './MBXAppDelegate.h',
-        './MBXAppDelegate.m',
-        './MBXViewController.h',
-        './MBXViewController.mm',
-        './MBXAnnotation.h',
-        './MBXAnnotation.m',
-        '../../platform/darwin/settings_nsuserdefaults.mm',
-      ],
-
-      'xcode_settings': {
-        'SDKROOT': 'iphoneos',
-        'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
-        'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
-        'INFOPLIST_FILE': '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',
-        'CLANG_ENABLE_MODULES': 'YES',
-      },
-
-      'configurations': {
-        'Debug': {
-          'xcode_settings': {
-            'CODE_SIGN_IDENTITY': 'iPhone Developer',
-          },
-        },
-        'Release': {
-          'xcode_settings': {
-            'CODE_SIGN_IDENTITY': 'iPhone Distribution',
-            'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ],
-          },
-        },
-      },
-    }
-  ]
-}
diff --git a/ios/app/mapboxgl-app.gypi b/ios/app/mapboxgl-app.gypi
new file mode 100644
index 0000000000..73b66dff12
--- /dev/null
+++ b/ios/app/mapboxgl-app.gypi
@@ -0,0 +1,63 @@
+{
+  'includes': [
+    '../../gyp/common.gypi',
+  ],
+  'targets': [
+    { 'target_name': 'iosapp',
+      'product_name': 'Mapbox GL',
+      'type': 'executable',
+      'product_extension': 'app',
+      'mac_bundle': 1,
+      'mac_bundle_resources': [
+        '<!@(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)',
+      ],
+
+      'sources': [
+        './main.m',
+        './MBXAppDelegate.h',
+        './MBXAppDelegate.m',
+        './MBXViewController.h',
+        './MBXViewController.mm',
+        './MBXAnnotation.h',
+        './MBXAnnotation.m',
+        '../../platform/darwin/settings_nsuserdefaults.mm',
+      ],
+
+      'xcode_settings': {
+        'SDKROOT': 'iphoneos',
+        'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
+        'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
+        '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',
+        'CLANG_ENABLE_MODULES': 'YES',
+      },
+
+      'configurations': {
+        'Debug': {
+          'xcode_settings': {
+            'CODE_SIGN_IDENTITY': 'iPhone Developer',
+          },
+        },
+        'Release': {
+          'xcode_settings': {
+            'CODE_SIGN_IDENTITY': 'iPhone Distribution',
+            'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ],
+          },
+        },
+      },
+    }
+  ]
+}
-- 
cgit v1.2.1