From df0511af185c334c7480f06bbc21b974a2a320fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= <mxn@1ec5.org>
Date: Tue, 1 Dec 2015 22:37:43 -0800
Subject: [osx] Build framework based on static library

---
 gyp/platform-osx.gypi | 50 ++++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

(limited to 'gyp/platform-osx.gypi')

diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index 1462d6e364..66eef43277 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -45,27 +45,26 @@
         '../platform/darwin/MGLPolygon.mm',
         '../include/mbgl/osx/Mapbox.h',
         '../include/mbgl/osx/MGLAccountManager.h',
-        '../platform/osx/sdk/MGLAccountManager_Private.h',
-        '../platform/osx/sdk/MGLAccountManager.m',
+        '../platform/osx/src/MGLAccountManager_Private.h',
+        '../platform/osx/src/MGLAccountManager.m',
         '../include/mbgl/osx/MGLMapView.h',
-        '../platform/osx/sdk/MGLMapView_Private.h',
-        '../platform/osx/sdk/MGLMapView.mm',
+        '../platform/osx/src/MGLMapView_Private.h',
+        '../platform/osx/src/MGLMapView.mm',
         '../include/mbgl/osx/MGLMapView+IBAdditions.h',
-        '../platform/osx/sdk/MGLMapView+IBAdditions.m',
+        '../platform/osx/src/MGLMapView+IBAdditions.m',
         '../include/mbgl/osx/MGLMapViewDelegate.h',
-        '../platform/osx/sdk/MGLOpenGLLayer.h',
-        '../platform/osx/sdk/MGLOpenGLLayer.mm',
-        '../platform/osx/sdk/MGLCompassCell.h',
-        '../platform/osx/sdk/MGLCompassCell.m',
-        '../platform/osx/sdk/MGLAttributionButton.h',
-        '../platform/osx/sdk/MGLAttributionButton.m',
+        '../platform/osx/src/MGLOpenGLLayer.h',
+        '../platform/osx/src/MGLOpenGLLayer.mm',
+        '../platform/osx/src/MGLCompassCell.h',
+        '../platform/osx/src/MGLCompassCell.m',
+        '../platform/osx/src/MGLAttributionButton.h',
+        '../platform/osx/src/MGLAttributionButton.m',
         '../include/mbgl/osx/MGLAnnotationImage.h',
-        '../platform/osx/sdk/MGLAnnotationImage.m',
-        '../platform/osx/sdk/NSBundle+MGLAdditions.h',
-        '../platform/osx/sdk/NSBundle+MGLAdditions.m',
-        '../platform/osx/sdk/NSProcessInfo+MGLAdditions.h',
-        '../platform/osx/sdk/NSProcessInfo+MGLAdditions.m',
-        '../platform/osx/sdk/resources/',
+        '../platform/osx/src/MGLAnnotationImage.m',
+        '../platform/osx/src/NSBundle+MGLAdditions.h',
+        '../platform/osx/src/NSBundle+MGLAdditions.m',
+        '../platform/osx/src/NSProcessInfo+MGLAdditions.h',
+        '../platform/osx/src/NSProcessInfo+MGLAdditions.m',
       ],
 
       'variables': {
@@ -76,13 +75,11 @@
         ],
         'libraries': [
           '<@(libuv_static_libs)',
-        ],
-        'ldflags': [
-          '-framework Cocoa',
-          '-framework CoreLocation',
-          '-framework OpenGL',
-          '-framework QuartzCore',
-          '-framework SystemConfiguration',
+          '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+          '$(SDKROOT)/System/Library/Frameworks/CoreLocation.framework',
+          '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+          '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+          '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
         ],
       },
 
@@ -101,9 +98,6 @@
 
       'link_settings': {
         'libraries': [ '<@(libraries)' ],
-        'xcode_settings': {
-          'OTHER_LDFLAGS': [ '<@(ldflags)' ],
-        },
       },
 
       'direct_dependent_settings': {
@@ -113,7 +107,7 @@
           '../include',
         ],
         'mac_bundle_resources': [
-          '<!@(find ../platform/osx/sdk/resources -type f \! -name "README")',
+          '<!@(find ../platform/osx/src/resources -type f \! -name \'.*\')',
         ],
       },
     },
-- 
cgit v1.2.1