From 242993b43a27e6f013e622bb4f268c4fdf436ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Thu, 30 Oct 2014 15:06:10 -0400
Subject: fix gyp project

---
 linux/mapboxgl-app.gyp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'linux/mapboxgl-app.gyp')

diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp
index 913a1fac45..03a0c0aed7 100644
--- a/linux/mapboxgl-app.gyp
+++ b/linux/mapboxgl-app.gyp
@@ -22,13 +22,24 @@
         '<@(glfw3_cflags)',
         '-I<(boost_root)/include',
       ],
-      'libraries': [
-        '<@(png_ldflags)',
-        '<@(sqlite3_ldflags)',
-        '<@(glfw3_static_libs)',
-        '<@(glfw3_ldflags)',
-        '<@(curl_ldflags)',
-        '<@(zlib_ldflags)',
+      'variables': {
+        'ldflags': [
+          '<@(png_ldflags)',
+          '<@(sqlite3_ldflags)',
+          '<@(glfw3_static_libs)',
+          '<@(glfw3_ldflags)',
+          '<@(curl_ldflags)',
+          '<@(zlib_ldflags)',
+        ],
+      },
+      'conditions': [
+        ['OS == "mac"', {
+          'xcode_settings': {
+            'OTHER_LDFLAGS': [ '<@(ldflags)' ],
+          }
+        }, {
+          'ldflags': [ '<@(ldflags)' ],
+        }]
       ],
       'dependencies': [
         '../mapboxgl.gyp:mbgl-standalone',
-- 
cgit v1.2.1