From 9c13ec5fa392930e9a1880ad20c11ba47fdc54ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Fri, 28 Jul 2017 18:38:55 +0200 Subject: Replace bundled libjpeg by libjpeg-turbo 1.5.2 Most linux distribution uses libjpeg-turbo as a replacement for libjpeg. Since Qt will be linked against -turbo more frequently than the "original" libjpeg we should use it for the bundled copy, too. Also add an import script. [ChangeLog][Third-Party Code] Replaced bundled libjpeg by libjpeg-turbo 1.5.2 Change-Id: I41081db74f194cbc288820fc783c9fef16545efd Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll Reviewed-by: Eirik Aavitsland --- src/3rdparty/libjpeg/jconfig.manx | 43 --------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 src/3rdparty/libjpeg/jconfig.manx (limited to 'src/3rdparty/libjpeg/jconfig.manx') diff --git a/src/3rdparty/libjpeg/jconfig.manx b/src/3rdparty/libjpeg/jconfig.manx deleted file mode 100644 index cd529d7d15..0000000000 --- a/src/3rdparty/libjpeg/jconfig.manx +++ /dev/null @@ -1,43 +0,0 @@ -/* jconfig.manx --- jconfig.h for Amiga systems using Manx Aztec C ver 5.x. */ -/* see jconfig.txt for explanations */ - -#define HAVE_PROTOTYPES -#define HAVE_UNSIGNED_CHAR -#define HAVE_UNSIGNED_SHORT -/* #define void char */ -/* #define const */ -#undef CHAR_IS_UNSIGNED -#define HAVE_STDDEF_H -#define HAVE_STDLIB_H -#undef NEED_BSD_STRINGS -#undef NEED_SYS_TYPES_H -#undef NEED_FAR_POINTERS -#undef NEED_SHORT_EXTERNAL_NAMES -#undef INCOMPLETE_TYPES_BROKEN - -#ifdef JPEG_INTERNALS - -#undef RIGHT_SHIFT_IS_UNSIGNED - -#define TEMP_DIRECTORY "JPEGTMP:" /* recommended setting for Amiga */ - -#define SHORTxSHORT_32 /* produces better DCT code with Aztec C */ - -#endif /* JPEG_INTERNALS */ - -#ifdef JPEG_CJPEG_DJPEG - -#define BMP_SUPPORTED /* BMP image file format */ -#define GIF_SUPPORTED /* GIF image file format */ -#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */ -#undef RLE_SUPPORTED /* Utah RLE image file format */ -#define TARGA_SUPPORTED /* Targa image file format */ - -#define TWO_FILE_COMMANDLINE -#define NEED_SIGNAL_CATCHER -#undef DONT_USE_B_MODE -#undef PROGRESS_REPORT /* optional */ - -#define signal_catcher _abort /* hack for Aztec C naming requirements */ - -#endif /* JPEG_CJPEG_DJPEG */ -- cgit v1.2.3