From c11dc0fa333bb20b2c3706c4d2ff739f6c25cd36 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 29 Oct 2014 15:27:41 -0400
Subject: attempt to build against standalone libmgl.a

---
 gyp/mbgl-core.gypi  | 36 +++++++-----------------------------
 gyp/mbgl-linux.gypi |  6 ------
 2 files changed, 7 insertions(+), 35 deletions(-)

(limited to 'gyp')

diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi
index d6a9dd8fbc..c4b6712833 100644
--- a/gyp/mbgl-core.gypi
+++ b/gyp/mbgl-core.gypi
@@ -19,12 +19,6 @@
         'cflags': [
           '<@(uv_cflags)',
         ],
-        'ldflags': [
-          '<@(png_ldflags)',
-          '<@(uv_ldflags)',
-          '<@(sqlite3_ldflags)',
-          '<@(zlib_ldflags)',
-        ],
       },
       'sources': [
         '<!@(find src -name "*.cpp")',
@@ -39,14 +33,6 @@
       'include_dirs': [
         '../include',
       ],
-      'link_settings': {
-        'libraries': [
-          '<@(png_static_libs)',
-          '<@(uv_static_libs)',
-          '<@(sqlite3_static_libs)',
-          '<@(zlib_static_libs)',
-        ],
-      },
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {
@@ -57,21 +43,7 @@
           'cflags_cc': [ '<@(cflags_cc)' ],
           'cflags': [ '<@(cflags)' ],
         }]
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../include',
-        ],
-        'conditions': [
-          ['OS == "mac"', {
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [ '<@(ldflags)' ]
-            }
-          }, {
-            'ldflags': [ '<@(ldflags)' ]
-          }]
-        ]
-      }
+      ]
     },
     {
       'target_name': 'mbgl-standalone',
@@ -80,6 +52,11 @@
         'core_lib':'<(PRODUCT_DIR)/libmbgl-core.a',
         'standalone_lib':'<(PRODUCT_DIR)/libmbgl.a'
       },
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../include',
+        ],
+      },
       'actions': [
         {
           'action_name': 'build standalone core lib',
@@ -93,6 +70,7 @@
               './gyp/merge_static_libs.py',
               '<(standalone_lib)',
               '<@(uv_static_libs)',
+              '<@(curl_static_libs)',
               '<(core_lib)'
           ],
         }
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index f1ff1e3c95..337e98039e 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -27,12 +27,6 @@
       'include_dirs': [
         '../include',
       ],
-      'link_settings': {
-        'libraries': [
-          '<@(uv_static_libs)',
-          '<@(curl_static_libs)',
-        ],
-      },
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {
-- 
cgit v1.2.1