diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-08-03 17:04:31 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-08-04 14:08:58 +0200 |
| commit | e6053aa5475e03568f39e4967dc49ef4aba3c5fe (patch) | |
| tree | 0b8fa3e3f5159f28210ff2c0611d8900d9577006 /gyp/http-curl.gypi | |
| parent | b44fe1c7af889089a640097583add8cd90e9330a (diff) | |
| download | qtlocation-mapboxgl-e6053aa5475e03568f39e4967dc49ef4aba3c5fe.tar.gz | |
Make build system architecture agnostic to remove Android special case
Diffstat (limited to 'gyp/http-curl.gypi')
| -rw-r--r-- | gyp/http-curl.gypi | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gyp/http-curl.gypi b/gyp/http-curl.gypi index b7c5832359..7ae5b1b75f 100644 --- a/gyp/http-curl.gypi +++ b/gyp/http-curl.gypi @@ -17,17 +17,17 @@ 'variables': { 'cflags_cc': [ - '<@(uv_cflags)', - '<@(curl_cflags)', + '<@(libuv_cflags)', + '<@(libcurl_cflags)', '<@(boost_cflags)', ], 'ldflags': [ - '<@(uv_ldflags)', - '<@(curl_ldflags)', + '<@(libuv_ldflags)', + '<@(libcurl_ldflags)', ], 'libraries': [ - '<@(uv_static_libs)', - '<@(curl_static_libs)', + '<@(libuv_static_libs)', + '<@(libcurl_static_libs)', ], 'defines': [ '-DMBGL_HTTP_CURL' @@ -38,9 +38,9 @@ ['host == "android"', { 'variables': { # Android uses libzip and openssl to set CURL's CA bundle. - 'cflags_cc': [ '<@(zip_cflags)', '<@(openssl_cflags)' ], - 'ldflags': [ '<@(zip_ldflags)', ], - 'libraries': [ '<@(zip_static_libs)', ], + 'cflags_cc': [ '<@(libzip_cflags)', '<@(openssl_cflags)' ], + 'ldflags': [ '<@(libzip_ldflags)', ], + 'libraries': [ '<@(libzip_static_libs)', ], }, }], ['OS == "mac"', { |