diff options
| author | artemp <artem@mapnik.org> | 2014-11-03 10:43:55 +0000 |
|---|---|---|
| committer | artemp <artem@mapnik.org> | 2014-11-03 10:43:55 +0000 |
| commit | 4a5d4ea0aa823871b504a9189d08667daf91b63c (patch) | |
| tree | a1d48291592dff3bdd0e73f4e0c163961d8c5336 /gyp/mbgl-linux.gypi | |
| parent | 318d08706fdf1ee8e32ed00c96d2e8506a9a9935 (diff) | |
| parent | 551ff954a5e30c89c27f59a9848ba0a9be871adc (diff) | |
| download | qtlocation-mapboxgl-4a5d4ea0aa823871b504a9189d08667daf91b63c.tar.gz | |
Merge branch 'master' into nunicode
Conflicts:
configure
styles
Diffstat (limited to 'gyp/mbgl-linux.gypi')
| -rw-r--r-- | gyp/mbgl-linux.gypi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 9f01ba3bb5..a22bd8f7c2 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -7,6 +7,7 @@ 'hard_dependency': 1, 'variables': { 'cflags_cc': [ + '<@(png_cflags)', '<@(uv_cflags)', '<@(curl_cflags)', '<@(nu_cflags)', @@ -16,6 +17,7 @@ '<@(nu_cflags)', ], 'ldflags': [ + '<@(png_ldflags)', '<@(uv_ldflags)', '<@(curl_ldflags)', '<@(nu_ldflags)', @@ -26,10 +28,16 @@ '../platform/default/log_stderr.cpp', '../platform/default/string_stdlib.cpp', '../platform/default/http_request_baton_curl.cpp', + '../platform/default/image.cpp', ], 'include_dirs': [ '../include', ], + 'link_settings': { + 'libraries': [ + '<@(png_static_libs)', + ], + }, 'conditions': [ ['OS == "mac"', { 'xcode_settings': { @@ -37,7 +45,6 @@ 'OTHER_CFLAGS': [ '<@(cflags)' ], } }, { - 'ldflags': [ '<@(ldflags)' ], 'cflags_cc': [ '<@(cflags_cc)' ], 'cflags': [ '<@(cflags)' ], }] |