From e63dba14fb9f46bad1518dcf121c82b100940e28 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Fri, 21 Sep 2018 12:10:20 +0200 Subject: Update bundled libjpeg-turbo to version 2.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New, manually created configuration files (jconfig.h / jconfigint.h) for building in Qt are now placed outside the src directory. [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.0 Done-with: André Klitzing Change-Id: I77e34419ebe2f70038b9b80cdf13876055c2a35f Reviewed-by: Liang Qi --- src/3rdparty/libjpeg.pri | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/3rdparty/libjpeg.pri') diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri index 0d35bf8941..5effbe9d26 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -1,17 +1,13 @@ winrt: DEFINES += NO_GETENV -DEFINES += \ - C_ARITH_CODING_SUPPORTED=1 \ - D_ARITH_CODING_SUPPORTED=1 \ - BITS_IN_JSAMPLE=8 \ - JPEG_LIB_VERSION=80 \ - SIZEOF_SIZE_T=__SIZEOF_SIZE_T__ - # Disable warnings in 3rdparty code due to unused arguments gcc: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main -INCLUDEPATH += $$PWD/libjpeg/src +INCLUDEPATH += \ + $$PWD/libjpeg \ + $$PWD/libjpeg/src + SOURCES += \ $$PWD/libjpeg/src/jaricom.c \ $$PWD/libjpeg/src/jcapimin.c \ -- cgit v1.2.3