summaryrefslogtreecommitdiff
path: root/gyp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-01-20 14:47:15 +0100
committerKonstantin Käfer <mail@kkaefer.com>2016-01-22 16:00:51 +0100
commit9cfe64a12200dd8ec4d7cc522482383acde9f5ec (patch)
tree0310002e421411d614d3e08e20c239543d2fa7fa /gyp
parentb22073a5b2d9be67edb44a975a79084655e8eef4 (diff)
downloadqtlocation-mapboxgl-9cfe64a12200dd8ec4d7cc522482383acde9f5ec.tar.gz
[build] replace jpeg library with libjpeg-turbo
Diffstat (limited to 'gyp')
-rw-r--r--gyp/platform-android.gypi6
-rw-r--r--gyp/platform-linux.gypi6
2 files changed, 6 insertions, 6 deletions
diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi
index 189fe933ee..0471b753ef 100644
--- a/gyp/platform-android.gypi
+++ b/gyp/platform-android.gypi
@@ -29,7 +29,7 @@
'variables': {
'cflags_cc': [
'<@(libpng_cflags)',
- '<@(jpeg_cflags)',
+ '<@(libjpeg-turbo_cflags)',
'<@(libuv_cflags)',
'<@(nunicode_cflags)',
'<@(boost_cflags)',
@@ -38,7 +38,7 @@
],
'ldflags': [
'<@(libpng_ldflags)',
- '<@(jpeg_ldflags)',
+ '<@(libjpeg-turbo_ldflags)',
'<@(libuv_ldflags)',
'<@(nunicode_ldflags)',
'<@(sqlite_ldflags)',
@@ -46,7 +46,7 @@
],
'libraries': [
'<@(libpng_static_libs)',
- '<@(jpeg_static_libs)',
+ '<@(libjpeg-turbo_static_libs)',
'<@(libuv_static_libs)',
'<@(nunicode_static_libs)',
'<@(sqlite_static_libs)',
diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi
index d43915863a..1513828821 100644
--- a/gyp/platform-linux.gypi
+++ b/gyp/platform-linux.gypi
@@ -31,7 +31,7 @@
'variables': {
'cflags_cc': [
'<@(libpng_cflags)',
- '<@(jpeg_cflags)',
+ '<@(libjpeg-turbo_cflags)',
'<@(libuv_cflags)',
'<@(nunicode_cflags)',
'<@(boost_cflags)',
@@ -40,7 +40,7 @@
],
'ldflags': [
'<@(libpng_ldflags)',
- '<@(jpeg_ldflags)',
+ '<@(libjpeg-turbo_ldflags)',
'<@(libuv_ldflags)',
'<@(nunicode_ldflags)',
'<@(sqlite_ldflags)',
@@ -49,7 +49,7 @@
],
'libraries': [
'<@(libpng_static_libs)',
- '<@(jpeg_static_libs)',
+ '<@(libjpeg-turbo_static_libs)',
'<@(libuv_static_libs)',
'<@(nunicode_static_libs)',
'<@(sqlite_static_libs)',