diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 19:40:40 -0400 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 19:40:40 -0400 |
| commit | 77b21569ec806d154592863bf169eb7d1fa8027d (patch) | |
| tree | 770490a18e54e348675516132cc6447752e5f517 | |
| parent | b32748b42f6c9ec8d336f4571f6278a2eeeebae0 (diff) | |
| download | qtlocation-mapboxgl-77b21569ec806d154592863bf169eb7d1fa8027d.tar.gz | |
curl static libs fixes for osx
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | linux/mapboxgl-app.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -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)', |