move ios-specific configuration to common.gypi

gyp/common.gypi

@@ -41,7 +41,28 @@
             },
           }, {
             'cflags_cc': [ '-fPIC' ],
-          }]
+          }],
+          ['platform == "ios"', {
+            'xcode_settings': {
+              'SDKROOT': 'iphoneos',
+              'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
+              'CLANG_CXX_LIBRARY': 'libc++',
+              'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
+              'IPHONEOS_DEPLOYMENT_TARGET':'7.0',
+              'TARGETED_DEVICE_FAMILY': '1,2',
+              'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
+              'CLANG_ENABLE_OBJC_ARC': 'NO',
+              'CODE_SIGN_IDENTITY': 'iPhone Developer',
+              'SKIP_INSTALL': 'YES'
+            },
+            'configurations': {
+              'Release': {
+                'xcode_settings': {
+                  'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ],
+                },
+              },
+            },
+          }],
         ],
       }],
     ],

gyp/mbgl-ios.gypi

@@ -1,29 +1,4 @@
 {
-  'target_defaults': {
-    'target_conditions': [
-      ['_type == "static_library"', {
-        'xcode_settings': {
-          'SDKROOT': 'iphoneos',
-          'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
-          'CLANG_CXX_LIBRARY': 'libc++',
-          'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
-          'IPHONEOS_DEPLOYMENT_TARGET':'7.0',
-          'TARGETED_DEVICE_FAMILY': '1,2',
-          'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
-          'CLANG_ENABLE_OBJC_ARC': 'NO',
-          'CODE_SIGN_IDENTITY': 'iPhone Developer',
-          'SKIP_INSTALL': 'YES'
-        },
-        'configurations': {
-          'Release': {
-            'xcode_settings': {
-              'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ],
-            },
-          },
-        },
-      }],
-    ],
-  },
   'targets': [
     { 'target_name': 'mbgl-ios',
       'product_name': 'mbgl-ios',