[build] replace jpeg library with libjpeg-turbo

This commit is contained in:
Konstantin Käfer
2016-01-20 14:47:15 +01:00
parent b22073a5b2
commit 9cfe64a122
6 changed files with 12 additions and 12 deletions

4
configure vendored
View File

@@ -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

View File

@@ -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)',

View File

@@ -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)',

View File

@@ -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)',

View File

@@ -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

View File

@@ -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