diff options
| author | Leith Bade <leith@mapbox.com> | 2014-11-25 23:17:34 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-11-28 00:15:05 +1100 |
| commit | b3a0a205dfb2c03f2b428473437db4d5cc12d67a (patch) | |
| tree | f428b9e1786d96bcca06805404d849db4234dfd2 /gyp | |
| parent | 6d62aad0ed776fe3ea3403d72faa80dd95c38407 (diff) | |
| download | qtlocation-mapboxgl-b3a0a205dfb2c03f2b428473437db4d5cc12d67a.tar.gz | |
Fix jpeg android gyp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-android.gypi | 5 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gyp/mbgl-android.gypi b/gyp/mbgl-android.gypi index 8f35ddea9e..10ea93338e 100644 --- a/gyp/mbgl-android.gypi +++ b/gyp/mbgl-android.gypi @@ -8,6 +8,7 @@ 'variables': { 'cflags_cc': [ '<@(png_cflags)', + '<@(jpeg_cflags)', '<@(uv_cflags)', '<@(curl_cflags)', '<@(nu_cflags)', @@ -21,6 +22,7 @@ ], 'ldflags': [ '<@(png_ldflags)', + '<@(jpeg_ldflags)', '<@(uv_ldflags)', '<@(curl_ldflags)', '<@(nu_ldflags)', @@ -35,6 +37,9 @@ '../platform/default/string_stdlib.cpp', '../platform/default/http_request_baton_curl.cpp', '../platform/default/image.cpp', + '../platform/default/image_reader.cpp', + '../platform/default/png_reader.cpp', + '../platform/default/jpeg_reader.cpp', ], 'include_dirs': [ '../include', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index aee928685a..28d8fc33a9 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -8,7 +8,7 @@ 'variables': { 'cflags_cc': [ '<@(png_cflags)', - '<@(jpeg_cflags)', + '<@(jpeg_cflags)', '<@(uv_cflags)', '<@(curl_cflags)', '<@(nu_cflags)', |