diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:10 +0200 |
| commit | 0e1866017fd389629629b150ce252820592506cd (patch) | |
| tree | 681142ae0e610ef7af2a43ca2d62c3ea5ed5f91a /src/3rdparty/libjpeg.pri | |
| parent | 9567a34bc0d9be87d3b0d6cbcb841837ca1d5659 (diff) | |
| parent | 9a8175a13124e156948914854d2fda7436065b08 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
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 \ |