From 22f67bb8ab6960e1263f0c85ba540ff96123540b Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 29 Oct 2014 22:16:44 -0400
Subject: [PATCH] start passing ldflags

---
 gyp/install.gypi                          |  1 +
 gyp/mbgl.gypi                             | 75 -----------------------
 utils/mbgl-config/build.sh                |  3 +
 utils/mbgl-config/mbgl-config.template.sh |  2 +-
 4 files changed, 5 insertions(+), 76 deletions(-)
 delete mode 100644 gyp/mbgl.gypi

diff --git a/gyp/install.gypi b/gyp/install.gypi
index e7217219c..c25490c45 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -31,6 +31,7 @@
                     './utils/mbgl-config/build.sh',
                     '<(install_prefix)',
                     '<(platform)',
+                    '<@(png_ldflags)'
                 ]
               }
           ]
diff --git a/gyp/mbgl.gypi b/gyp/mbgl.gypi
deleted file mode 100644
index 0d914f46f..000000000
--- a/gyp/mbgl.gypi
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  'targets': [
-    { 'target_name': 'mbgl',
-      'product_name': 'mbgl',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'hard_dependency': 1,
-      'dependencies': [
-          'shaders',
-      ],
-      'sources': [
-        '<!@(find src -name "*.cpp")',
-        '<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")',
-        '<!@(find src -name "*.c")',
-        '<!@(find src -name "*.h")',
-        '<!@(find include -name "*.hpp")',
-        '<!@(find include -name "*.h")',
-        '<!@(find src -name "*.glsl")',
-        'bin/style.json'
-      ],
-      'include_dirs': [
-        '../include'
-      ],
-      'conditions': [
-        ['OS == "mac"', {
-          'xcode_settings': {
-            'PUBLIC_HEADERS_FOLDER_PATH': 'include',
-            'OTHER_CPLUSPLUSFLAGS': [
-              '<@(png_cflags)',
-              '<@(uv_cflags)',
-              '<@(sqlite3_cflags)',
-              '<@(zlib_cflags)',
-              '-I<(boost_root)/include',
-            ],
-            'OTHER_CFLAGS': [
-              '<@(uv_cflags)',
-            ],
-          },
-        }, {
-          'cflags': [
-            '<@(png_cflags)',
-            '<@(uv_cflags)',
-            '<@(sqlite3_cflags)',
-            '<@(zlib_cflags)',
-            '-I<(boost_root)/include',
-          ],
-        }]
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../include',
-        ],
-        'conditions': [
-          ['OS == "mac"', {
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '<@(png_libraries)',
-                '<@(uv_libraries)',
-                '<@(sqlite3_libraries)',
-                '<@(zlib_libraries)',
-              ]
-            }
-          }, {
-            'libraries': [
-              '<@(png_libraries)',
-              '<@(uv_libraries)',
-              '<@(sqlite3_libraries)',
-              '<@(zlib_libraries)',
-            ]
-          }]
-        ]
-      }
-    }
-  ]
-}
diff --git a/utils/mbgl-config/build.sh b/utils/mbgl-config/build.sh
index 4fd4a93cf..fe7cbdf60 100755
--- a/utils/mbgl-config/build.sh
+++ b/utils/mbgl-config/build.sh
@@ -2,6 +2,8 @@
 
 PREFIX=$1
 PLATFORM=$2
+shift
+shift
 
 VARIABLES="#!/bin/bash
 
@@ -9,6 +11,7 @@ VARIABLES="#!/bin/bash
 
 CONFIG_MBGL_PREFIX=$PREFIX
 CONFIG_MBGL_PLATFORM=$PLATFORM
+CONFIG_MBGL_LDFLAGS=\"$@\"
 "
 
 echo "$VARIABLES" | cat - utils/mbgl-config/mbgl-config.template.sh \
diff --git a/utils/mbgl-config/mbgl-config.template.sh b/utils/mbgl-config/mbgl-config.template.sh
index 2b1b1a122..16b67b1f0 100644
--- a/utils/mbgl-config/mbgl-config.template.sh
+++ b/utils/mbgl-config/mbgl-config.template.sh
@@ -43,7 +43,7 @@ while test $# -gt 0; do
       ;;
 
     --libs)
-      echo -L${CONFIG_MBGL_PREFIX}/lib -lmbgl -lmbgl-${CONFIG_MBGL_PLATFORM} -lmbgl-headless
+      echo -L${CONFIG_MBGL_PREFIX}/lib -lmbgl -lmbgl-${CONFIG_MBGL_PLATFORM} -lmbgl-headless ${CONFIG_MBGL_LDFLAGS}
       ;;
 
     --includedir)