diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 12:40:16 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 12:40:16 -0700 |
commit | 592ed57d09f8f0913dae195e6e867884d11a2327 (patch) | |
tree | 6dd3a1d4a027a40e525484de68a34c6754f291b3 /gyp | |
parent | 3d6a87ab1b43e4f4712e5456ccf91bdcbc15bb7e (diff) | |
download | qtlocation-mapboxgl-592ed57d09f8f0913dae195e6e867884d11a2327.tar.gz |
use more modern libpng version instead of the system-provided one and fix compile errors
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/mbgl-linux.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 2b166ea434..ca3e2afc54 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -30,6 +30,11 @@ 'include_dirs': [ '../include', ], + 'link_settings': { + 'libraries': [ + '<@(png_static_libs)', + ], + }, 'conditions': [ ['OS == "mac"', { 'xcode_settings': { @@ -37,7 +42,6 @@ 'OTHER_CFLAGS': [ '<@(cflags)' ], } }, { - 'ldflags': [ '<@(ldflags)' ], 'cflags_cc': [ '<@(cflags_cc)' ], 'cflags': [ '<@(cflags)' ], }] |