diff options
| author | Shailesh Mistry <shailesh.mistry@hotmail.co.uk> | 2013-05-18 00:02:00 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-24 18:13:15 +0100 |
| commit | a1c8ba17f74180c5e05c4eb7b67912d14ea7b080 (patch) | |
| tree | 3cd022e899d05cf9cd49a9f920a88a3d95ec30ae /scripts | |
| parent | 6a3d99b2a38e304a32059066b6c4026b746d935c (diff) | |
| download | mupdf-a1c8ba17f74180c5e05c4eb7b67912d14ea7b080.tar.xz | |
Update build to use the latest openJPEG2
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/opj_config.h | 26 | ||||
| -rw-r--r-- | scripts/opj_config_private.h | 48 |
2 files changed, 49 insertions, 25 deletions
diff --git a/scripts/opj_config.h b/scripts/opj_config.h index 39b38228..8ed0857f 100644 --- a/scripts/opj_config.h +++ b/scripts/opj_config.h @@ -1,7 +1,7 @@ /* If you want to build the library manually without using * 'configure' or 'CMake' * then copy this file - * 'opj_config.h.in.user' + * 'opj_config.h.cmake.in' * to * 'opj_config.h' * @@ -17,29 +17,5 @@ * === DO NOT FORGET TO CHANGE 'config.nix' APPROPRIATELY. ==== */ -#define USE_JPIP -#define USE JPWL -#define OPJ_PACKAGE_VERSION "2.0.0" -/* DO NOT DEFINE BOTH VERSIONS OF LCMS */ -/* define to 1 if you have both liblcms and lcms.h installed */ -#undef HAVE_LIBLCMS1 -/* #define HAVE_LIBLCMS1 1 */ -/* define to 1 if you have both liblcms2 and lcms2.h installed */ -#undef HAVE_LIBLCMS2 -/* #define HAVE_LIBLCMS2 1 */ - -/* define to 1 if you have both libpng and png.h installed */ -#undef HAVE_LIBPNG -/* #define HAVE_LIBPNG 1 */ - -/* define to 1 if you have both libtiff and tiff.h installed */ -#undef HAVE_LIBTIFF -/* #define HAVE_LIBTIFF 1 */ - -/*---------------- DO NOT CHANGE BELOW THIS LINE ----------------*/ -#define PACKAGE_URL "http://www.openjpeg.org/" -#define PACKAGE_BUGREPORT "http://code.google.com/p/openjpeg/" - -#define PACKAGE_VERSION "1.4.0" diff --git a/scripts/opj_config_private.h b/scripts/opj_config_private.h new file mode 100644 index 00000000..70f1f6d8 --- /dev/null +++ b/scripts/opj_config_private.h @@ -0,0 +1,48 @@ +/* If you want to build the library manually without using + * 'configure' or 'CMake' + * then copy this file + * 'opj_config_private.h.cmake.in' + * to + * 'opj_config_private.h' + * + * Open 'opj_config_private.h' and change the file contents + * if you want to define something because you know you have + * BOTH installed the library AND the header file(s). + * Then e.g. write +#define HAVE_LIBPNG 1 + * + * + * The file 'opj_config_private.h' will be included in some source files. + * ==== YOU CAN NOT COMPILE WITHOUT IT. ==== + * === DO NOT FORGET TO CHANGE 'config.nix' APPROPRIATELY. ==== +*/ + +#ifndef _WIN32 +#define OPJ_HAVE_INTTYPES_H 1 +#else +#undef OPJ_HAVE_INTTYPES_H +#endif + +#define USE_JPIP +#define OPJ_PACKAGE_VERSION "2.0.0" + +/* DO NOT DEFINE BOTH VERSIONS OF LCMS */ +/* define to 1 if you have both liblcms and lcms.h installed */ +#undef OPJ_HAVE_LIBLCMS1 +/* #define OPJ_HAVE_LIBLCMS1 1 */ + +/* define to 1 if you have both liblcms2 and lcms2.h installed */ +#undef OPJ_HAVE_LIBLCMS2 +/* #define OPJ_HAVE_LIBLCMS2 1 */ + +/* define to 1 if you have both libpng and png.h installed */ +#undef OPJ_HAVE_LIBPNG +/* #define OPJ_HAVE_LIBPNG 1 */ + +/* define to 1 if you have both libtiff and tiff.h installed */ +#undef OPJ_HAVE_LIBTIFF +/* #define OPJ_HAVE_LIBTIFF 1 */ + +/*---------------- DO NOT CHANGE BELOW THIS LINE ----------------*/ +#define PACKAGE_URL "http://www.openjpeg.org/" +#define PACKAGE_BUGREPORT "http://code.google.com/p/openjpeg/" |