diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-01-20 00:07:04 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-01-20 10:35:44 +0200 |
| commit | 9cd9065031f7d2af62e437f2b32b44207484baca (patch) | |
| tree | 7eaa326b4d183fc1d26ae64492588bbeb7a4b615 /gyp | |
| parent | d34f8eb674b9753c47616f37ae88ff7a02f61ba0 (diff) | |
| download | qtlocation-mapboxgl-9cd9065031f7d2af62e437f2b32b44207484baca.tar.gz | |
Revert "Revert WebP support due to broken builds"
This reverts commit 6709bdcacd5a45a10b554f3f225206c9494e5e43.
There was an issue with the script that removes '-lwebp' from WebP
linker flags, since we're statically linking. This is now fixed.
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/platform-linux.gypi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi index 22dc452f33..d43915863a 100644 --- a/gyp/platform-linux.gypi +++ b/gyp/platform-linux.gypi @@ -17,6 +17,7 @@ '../platform/default/application_root.cpp', '../platform/default/thread.cpp', '../platform/default/image.cpp', + '../platform/default/webp_reader.cpp', '../platform/default/png_reader.cpp', '../platform/default/jpeg_reader.cpp', '../platform/default/timer.cpp', @@ -35,6 +36,7 @@ '<@(nunicode_cflags)', '<@(boost_cflags)', '<@(sqlite_cflags)', + '<@(webp_cflags)', ], 'ldflags': [ '<@(libpng_ldflags)', @@ -43,6 +45,7 @@ '<@(nunicode_ldflags)', '<@(sqlite_ldflags)', '<@(zlib_ldflags)', + '<@(webp_ldflags)', ], 'libraries': [ '<@(libpng_static_libs)', @@ -51,6 +54,7 @@ '<@(nunicode_static_libs)', '<@(sqlite_static_libs)', '<@(zlib_static_libs)', + '<@(webp_static_libs)', ], }, |