diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-09-21 12:10:20 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-09-28 14:11:44 +0000 |
| commit | e63dba14fb9f46bad1518dcf121c82b100940e28 (patch) | |
| tree | c7a3468073a9c623d8f6659166962dd743107dc5 /src/3rdparty/libjpeg.pri | |
| parent | ecfa33e751115919ddb47a6f641a2b1842c96788 (diff) | |
Update bundled libjpeg-turbo to version 2.0.0
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 <aklitzing@gmail.com>
Change-Id: I77e34419ebe2f70038b9b80cdf13876055c2a35f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/libjpeg.pri')
| -rw-r--r-- | src/3rdparty/libjpeg.pri | 12 |
1 files changed, 4 insertions, 8 deletions
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 \ |