use stable cross-generator direction for referencing standalone lib + other minor fixups

5 files changed, 14 insertions, 20 deletions

diff --git a/gyp/common.gypi b/gyp/common.gypi
index 163f2ce0a7..c25bb77779 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 6805c135c4..8fba986492 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 e6b90a6b27..ed4a029fb6 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 1baf06c1f3..755b3cc483 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 38aea690f4..bee0325498 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)' ],
-        },
+        ]
       },
     },
   ],