From d8a93dbb9542ca6f05372221ee69c086b7750a4c Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 29 Oct 2014 18:13:25 -0400
Subject: [PATCH] use stable cross-generator direction for referencing
 standalone lib + other minor fixups

---
 Makefile                |  1 +
 gyp/common.gypi         |  1 +
 gyp/install.gypi        |  2 +-
 gyp/mbgl-core.gypi      | 11 ++++++++++-
 gyp/mbgl-ios.gypi       | 10 +---------
 gyp/mbgl-osx.gypi       | 10 +---------
 linux/mapboxgl-app.gyp  |  3 ---
 macosx/mapboxgl-app.gyp |  2 --
 test/test.gyp           |  2 --
 9 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index ed75627f4..c4d42bfd4 100644
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,7 @@ lproj: config.gypi linux/mapboxgl-app.gyp clear_xcode_cache
 clean: clear_xcode_cache
 	-find ./deps/gyp -name "*.pyc" -exec rm {} \;
 	-rm -rf ./build/
+	-rm -rf ./macosx/build/
 	-rm -rf ./config.gypi ./config-ios.gypi
 
 distclean: clean
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 163f2ce0a..c25bb7777 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -1,6 +1,7 @@
 {
   'variables': {
     'install_prefix%': '',
+    'standalone_product_dir':'<!@(pwd)/../build'
   },
   'target_defaults': {
     'default_configuration': 'Release',
diff --git a/gyp/install.gypi b/gyp/install.gypi
index 6805c135c..8fba98649 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -12,7 +12,7 @@
             'mbgl-<(platform)',
           ],
           'copies': [
-            { 'files': [ '<(PRODUCT_DIR)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' },
+            { 'files': [ '<(standalone_product_dir)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' },
             { 'files': [ '<(PRODUCT_DIR)/libmbgl-core.a' ], 'destination': '<(install_prefix)/lib' },
             { 'files': [ '<(PRODUCT_DIR)/libmbgl-headless.a' ], 'destination': '<(install_prefix)/lib' },
             { 'files': [ '<(PRODUCT_DIR)/libmbgl-<(platform).a' ], 'destination': '<(install_prefix)/lib' },
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi
index e6b90a6b2..ed4a029fb 100644
--- a/gyp/mbgl-core.gypi
+++ b/gyp/mbgl-core.gypi
@@ -54,12 +54,21 @@
       ],
       'variables': {
         'core_lib':'<(PRODUCT_DIR)/libmbgl-core.a',
-        'standalone_lib':'<(PRODUCT_DIR)/libmbgl.a'
+        'standalone_lib':'<(standalone_product_dir)/libmbgl.a'
       },
       'direct_dependent_settings': {
         'include_dirs': [
           '../include',
         ],
+        'conditions': [
+          ['OS == "mac"', {
+            'xcode_settings': {
+              'OTHER_LDFLAGS': [ '<(standalone_lib)' ],
+            }
+          }, {
+            'ldflags': [ '<(standalone_lib)' ],
+          }]
+        ],
       },
       'actions': [
         {
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi
index 1baf06c1f..755b3cc48 100644
--- a/gyp/mbgl-ios.gypi
+++ b/gyp/mbgl-ios.gypi
@@ -41,18 +41,10 @@
       'xcode_settings': {
         'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ],
       },
-      'link_settings': {
-        'libraries': [
-          '<@(uv_static_libs)',
-        ],
-      },
       'direct_dependent_settings': {
         'include_dirs': [
           '../include',
-        ],
-        'xcode_settings': {
-          'OTHER_LDFLAGS': [ '<@(uv_ldflags)' ],
-        },
+        ]
       },
     },
   ],
diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi
index 38aea690f..bee032549 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/mbgl-osx.gypi
@@ -17,18 +17,10 @@
       'xcode_settings': {
         'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ],
       },
-      'link_settings': {
-        'libraries': [
-          '<@(uv_static_libs)',
-        ],
-      },
       'direct_dependent_settings': {
         'include_dirs': [
           '../include',
-        ],
-        'xcode_settings': {
-          'OTHER_LDFLAGS': [ '<@(uv_ldflags)' ],
-        },
+        ]
       },
     },
   ],
diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp
index 724463ab5..027612cbd 100644
--- a/linux/mapboxgl-app.gyp
+++ b/linux/mapboxgl-app.gyp
@@ -23,9 +23,6 @@
         '-I<(boost_root)/include',
       ],
       'libraries': [
-        '-L<(PRODUCT_DIR)/',
-        '-lmbgl',
-        '-lmbgl-linux',
         '<@(curl_static_libs)',
         '<@(png_ldflags)',
         '<@(sqlite3_ldflags)',
diff --git a/macosx/mapboxgl-app.gyp b/macosx/mapboxgl-app.gyp
index e5789fffd..0e6fe3804 100644
--- a/macosx/mapboxgl-app.gyp
+++ b/macosx/mapboxgl-app.gyp
@@ -37,8 +37,6 @@
       },
       'variables' : {
         'ldflags': [
-          '-L<(PRODUCT_DIR)/',
-          '-lmbgl',
           '<@(sqlite3_ldflags)',
           '<@(glfw3_static_libs)',
           '<@(glfw3_ldflags)',
diff --git a/test/test.gyp b/test/test.gyp
index 9b1e36909..66bc97d8e 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -5,8 +5,6 @@
   ],
   'target_defaults': {
     "libraries": [
-      '-L<(PRODUCT_DIR)/',
-      '-lmbgl',
       '<@(uv_ldflags)',
       '<@(curl_static_libs)',
       '<@(png_ldflags)',