From fbe30e04c48353a9fdd14151728e27ffe168c9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 23 Jan 2015 12:39:28 +0100
Subject: [PATCH] move ios-specific configuration to common.gypi

---
 gyp/common.gypi   | 23 ++++++++++++++++++++++-
 gyp/mbgl-ios.gypi | 25 -------------------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/gyp/common.gypi b/gyp/common.gypi
index a569669c4..3d3bddb67 100644
--- a/gyp/common.gypi
+++ b/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" ],
+                },
+              },
+            },
+          }],
         ],
       }],
     ],
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi
index 41b04e97c..e6fa24589 100644
--- a/gyp/mbgl-ios.gypi
+++ b/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',