diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-01-20 14:47:15 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-01-22 16:00:51 +0100 |
| commit | 9cfe64a12200dd8ec4d7cc522482383acde9f5ec (patch) | |
| tree | 0310002e421411d614d3e08e20c239543d2fa7fa | |
| parent | b22073a5b2d9be67edb44a975a79084655e8eef4 (diff) | |
| download | qtlocation-mapboxgl-9cfe64a12200dd8ec4d7cc522482383acde9f5ec.tar.gz | |
[build] replace jpeg library with libjpeg-turbo
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | gyp/platform-android.gypi | 6 | ||||
| -rw-r--r-- | gyp/platform-linux.gypi | 6 | ||||
| -rw-r--r-- | platform/android/mapboxgl-app.gypi | 4 | ||||
| -rw-r--r-- | platform/android/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | platform/linux/scripts/configure.sh | 2 |
6 files changed, 12 insertions, 12 deletions
@@ -32,7 +32,7 @@ function print_flags { if [ "$(type -t print_${NAME}_flags)" = 'function' ]; then print_${NAME}_flags else - local VERSION=`echo "${NAME}_VERSION" | tr "[:lower:]" "[:upper:]"` + local VERSION=`echo "${NAME}_VERSION" | tr "[:lower:]-" "[:upper:]_"` if [ ! -z ${!VERSION:-} ] ; then mason install ${NAME} ${!VERSION} for FLAGS in "$@" ; do @@ -94,7 +94,7 @@ print_flags openssl static_libs cflags ldflags print_flags libcurl static_libs cflags ldflags print_flags glfw static_libs cflags ldflags print_flags libpng static_libs cflags ldflags -print_flags jpeg static_libs cflags ldflags +print_flags libjpeg-turbo static_libs cflags ldflags print_flags sqlite static_libs cflags ldflags print_flags libuv static_libs cflags ldflags print_flags zlib static_libs cflags ldflags 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)', diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi index 84304ec2d9..bb849d64ab 100644 --- a/platform/android/mapboxgl-app.gypi +++ b/platform/android/mapboxgl-app.gypi @@ -30,7 +30,7 @@ ], 'libraries': [ '<@(libpng_static_libs)', - '<@(jpeg_static_libs)', + '<@(libjpeg-turbo_static_libs)', '<@(sqlite_static_libs)', '<@(libuv_static_libs)', '<@(nunicode_static_libs)', @@ -45,7 +45,7 @@ '-lstdc++', '-latomic', '<@(libpng_ldflags)', - '<@(jpeg_ldflags)', + '<@(libjpeg-turbo_ldflags)', '<@(sqlite_ldflags)', '<@(zlib_ldflags)', '<@(libzip_ldflags)', diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh index 2e3d9bf8a4..9a4f0eb92a 100644 --- a/platform/android/scripts/configure.sh +++ b/platform/android/scripts/configure.sh @@ -2,7 +2,7 @@ BOOST_VERSION=1.59.0 LIBPNG_VERSION=1.6.20 -JPEG_VERSION=v9a +LIBJPEG_TURBO_VERSION=1.4.2 SQLITE_VERSION=3.9.1 LIBUV_VERSION=1.7.5 ZLIB_VERSION=system diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh index 8510d83bdc..69d3f22bff 100644 --- a/platform/linux/scripts/configure.sh +++ b/platform/linux/scripts/configure.sh @@ -5,7 +5,7 @@ BOOST_LIBPROGRAM_OPTIONS_VERSION=1.59.0 LIBCURL_VERSION=system GLFW_VERSION=3.1.2 LIBPNG_VERSION=1.6.20 -JPEG_VERSION=v9a +LIBJPEG_TURBO_VERSION=1.4.2 SQLITE_VERSION=3.9.1 LIBUV_VERSION=1.7.5 ZLIB_VERSION=system |