From 77b21569ec806d154592863bf169eb7d1fa8027d Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 29 Oct 2014 19:40:40 -0400 Subject: curl static libs fixes for osx --- configure | 2 ++ linux/mapboxgl-app.gyp | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 43a665f29b..afb94d4795 100755 --- a/configure +++ b/configure @@ -99,6 +99,8 @@ if [ ! -z ${LIBCURL_VERSION} ]; then CONFIG+=" 'curl_static_libs': $(quote_flags $(mason static_libs libcurl ${LIBCURL_VERSION})),"$LN CONFIG+=" 'curl_cflags': $(quote_flags $(mason cflags libcurl ${LIBCURL_VERSION})),"$LN CONFIG+=" 'curl_ldflags': $(quote_flags $(mason ldflags libcurl ${LIBCURL_VERSION})),"$LN +else + CONFIG+=" 'curl_static_libs': [],"$LN fi if [ ! -z ${GLFW_VERSION} ]; then diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index 027612cbd4..75ad23552e 100644 --- a/linux/mapboxgl-app.gyp +++ b/linux/mapboxgl-app.gyp @@ -23,7 +23,6 @@ '-I<(boost_root)/include', ], 'libraries': [ - '<@(curl_static_libs)', '<@(png_ldflags)', '<@(sqlite3_ldflags)', '<@(glfw3_static_libs)', -- cgit v1.2.1