diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-29 11:32:54 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-29 11:32:54 -0400 |
| commit | 1d82ae14a4d14a9ad42a4dabde63d3cba57ef02b (patch) | |
| tree | 627176310bb0c0cccfb08e7794fb7422f2e9e0ec /gyp | |
| parent | 3a5b5e68e922582111ce1f67cc9722214e4546ad (diff) | |
| download | qtlocation-mapboxgl-1d82ae14a4d14a9ad42a4dabde63d3cba57ef02b.tar.gz | |
pass on libraries in link_settings
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-ios.gypi | 8 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 10 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 8 | ||||
| -rw-r--r-- | gyp/mbgl.gypi | 16 |
4 files changed, 24 insertions, 18 deletions
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index daa0052b12..3fce6c2499 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -40,9 +40,11 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ], }, - 'libraries': [ - '<@(uv_static_libs)', - ], + 'link_settings': { + 'libraries': [ + '<@(uv_static_libs)', + ], + }, 'direct_dependent_settings': { 'include_dirs': [ '../include', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index ea0ce3ee99..b15cf0e253 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -26,10 +26,12 @@ 'include_dirs': [ '../include', ], - 'libraries': [ - '<@(uv_static_libs)', - '<@(curl_static_libs)', - ], + 'link_settings': { + 'libraries': [ + '<@(uv_static_libs)', + '<@(curl_static_libs)', + ], + }, 'conditions': [ ['OS == "mac"', { 'xcode_settings': { diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index e0a683f218..6c98265bbd 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -16,9 +16,11 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ], }, - 'libraries': [ - '<@(uv_static_libs)', - ], + 'link_settings': { + 'libraries': [ + '<@(uv_static_libs)', + ], + }, 'direct_dependent_settings': { 'include_dirs': [ '../include', diff --git a/gyp/mbgl.gypi b/gyp/mbgl.gypi index d69fcc95b2..fd5c586c2f 100644 --- a/gyp/mbgl.gypi +++ b/gyp/mbgl.gypi @@ -38,19 +38,19 @@ 'include_dirs': [ '../include', ], - 'libraries': [ - '<@(png_static_libs)', - '<@(uv_static_libs)', - '<@(sqlite3_static_libs)', - '<@(zlib_static_libs)', - ], + 'link_settings': { + 'libraries': [ + '<@(png_static_libs)', + '<@(uv_static_libs)', + '<@(sqlite3_static_libs)', + '<@(zlib_static_libs)', + ], + }, 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'OTHER_CFLAGS': [ '<@(cflags)' ], - # Makefile builds don't respect 'libraries' on OS X. - 'OTHER_LDFLAGS': [ '>@(_libraries)' ], }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], |