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/import_from_libjpeg_tarball.sh | |
| 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/import_from_libjpeg_tarball.sh')
| -rwxr-xr-x | src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh b/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh index b22f6b0d47..8dafbda64d 100755 --- a/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh +++ b/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh @@ -42,7 +42,7 @@ # into 3rdparty/libjpeg/. if [ $# -ne 2 ]; then - echo "Usage: $0 LIBJPEG_tarball_dir/ \$QTDIR/src/3rdparty/LIBJPEG/" + echo "Usage: $0 LIBJPEG_tarball_dir/ \$QTDIR/src/3rdparty/libjpeg/" exit 1 fi @@ -75,14 +75,14 @@ copy_file() { } copy_file "LICENSE.md" "LICENSE" -copy_file "jconfig.txt" "src/jconfig.h" -copy_file "win/jconfigint.h.in" "src/jconfigint.h" FILES=" change.log ChangeLog.md README.md README.ijg + jconfig.h.in + jconfigint.h.in jaricom.c jcapimin.c @@ -163,3 +163,5 @@ FILES=" for i in $FILES; do copy_file "$i" "src/$i" done + +echo Done. $TARGET_DIR/jconfig.h and jconfigint.h may need manual updating. |