diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 15:06:10 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 15:06:10 -0400 |
| commit | 242993b43a27e6f013e622bb4f268c4fdf436ac7 (patch) | |
| tree | 625eb8687806fb8fcb1126b4b02b7f3e73849b9c /linux | |
| parent | e3bc69b7e77aa6771c8db3695f12548447e1de51 (diff) | |
| download | qtlocation-mapboxgl-242993b43a27e6f013e622bb4f268c4fdf436ac7.tar.gz | |
fix gyp project
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/mapboxgl-app.gyp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index 913a1fac45..03a0c0aed7 100644 --- a/linux/mapboxgl-app.gyp +++ b/linux/mapboxgl-app.gyp @@ -22,13 +22,24 @@ '<@(glfw3_cflags)', '-I<(boost_root)/include', ], - 'libraries': [ - '<@(png_ldflags)', - '<@(sqlite3_ldflags)', - '<@(glfw3_static_libs)', - '<@(glfw3_ldflags)', - '<@(curl_ldflags)', - '<@(zlib_ldflags)', + 'variables': { + 'ldflags': [ + '<@(png_ldflags)', + '<@(sqlite3_ldflags)', + '<@(glfw3_static_libs)', + '<@(glfw3_ldflags)', + '<@(curl_ldflags)', + '<@(zlib_ldflags)', + ], + }, + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ '<@(ldflags)' ], + } + }, { + 'ldflags': [ '<@(ldflags)' ], + }] ], 'dependencies': [ '../mapboxgl.gyp:mbgl-standalone', |