[ios, osx] Eliminate use of main.mk

2016-04-18 17:38:51 -07:00
parent 24a9d47944
commit 2d33ae5ed7
4 changed files with 31 additions and 23 deletions
--- a/platform/ios/platform.gyp
+++ b/platform/ios/platform.gyp
@@ -2,8 +2,10 @@
  'variables': {
    'loop_lib': 'darwin',
    'headless_lib': 'eagl',
+    'coverage': 0,
  },
  'includes': [
+    '../../build/ios-all/config.gypi',
    '../../mbgl.gypi',
    '../../test/test.gypi',
  ],
--- a/platform/osx/platform.gyp
+++ b/platform/osx/platform.gyp
@@ -2,8 +2,10 @@
  'variables': {
    'loop_lib': 'darwin',
    'headless_lib': 'cgl',
+    'coverage': 0,
  },
  'includes': [
+    '../../build/osx-x86_64/config.gypi',
    '../../mbgl.gypi',
    '../../test/test.gypi',
    '../../bin/glfw.gypi',