From 3b63026d9adf8258a64ed7ca86ec61ba01f9ef6f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 12 Nov 2017 00:43:41 +0100 Subject: [PATCH] Add manually maintained config header used for wxWidgets build Preserve the behaviour before the submodule switch, even if it is clearly not ideal and we should use libjpeg configure under Unix. --- jconfig.h | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 jconfig.h diff --git a/jconfig.h b/jconfig.h new file mode 100644 index 0000000..a5a0882 --- /dev/null +++ b/jconfig.h @@ -0,0 +1,79 @@ +#if defined(_WIN32) +#include "jconfig.vc" +#else + +/* jconfig.h. Generated automatically by configure. */ +/* jconfig.cfg --- source file edited by configure script */ +/* see jconfig.doc for explanations */ + +/* use wxWidgets' configure */ +#include "wx/setup.h" + +#define HAVE_PROTOTYPES +#define HAVE_UNSIGNED_CHAR +#define HAVE_UNSIGNED_SHORT +#undef void +#undef const + +/* use wxWidgets' configure */ +/* #undef CHAR_IS_UNSIGNED */ +#ifdef __CHAR_UNSIGNED__ + #ifndef CHAR_IS_UNSIGNED + #define CHAR_IS_UNSIGNED + #endif +#else + #undef CHAR_IS_UNSIGNED +#endif + +#ifndef HAVE_STDDEF_H +#define HAVE_STDDEF_H +#endif + +#ifndef HAVE_STDLIB_H +#define HAVE_STDLIB_H +#endif + +#undef NEED_BSD_STRINGS +#undef NEED_SYS_TYPES_H +#undef NEED_FAR_POINTERS +#undef NEED_SHORT_EXTERNAL_NAMES +/* Define this if you get warnings about undefined structures. */ +#undef INCOMPLETE_TYPES_BROKEN + +#ifdef JPEG_INTERNALS + +#undef RIGHT_SHIFT_IS_UNSIGNED + +/* use wxWidgets' configure */ +/* #define INLINE __inline__ */ +#if defined(__WATCOMC__) +#define INLINE +#else +#define INLINE inline +#endif + +/* These are for configuring the JPEG memory manager. */ +#undef DEFAULT_MAX_MEM +#undef NO_MKTEMP + +#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 */ + +#undef TWO_FILE_COMMANDLINE +#undef NEED_SIGNAL_CATCHER +#undef DONT_USE_B_MODE + +/* Define this if you want percent-done progress reports from cjpeg/djpeg. */ +#undef PROGRESS_REPORT + +#endif /* JPEG_CJPEG_DJPEG */ +#endif + /* _MSC_VER */ +