forked from bartvdbraak/blender
5fae2503bf
This reverts commit f12204196fb1ee985ab9745cf9c70877601145f9. Campbell, sorry. have to revert this for the time being. We've missed some very important bits, such as: - FFmpeg is usually linked against OpenJPEG - OIIO needs OpenJPEG as well. For FFmpeg issues we can either disable OpenJPEG there (since we don't really use it), or bump FFmpeg to version 3.1.1 which can use either of OpenJPEG 1.5 or 2.1. For OIIO we do need OpenJPEG support (otherwise Cycles will not be able to use j2k/j2c textures) and currently there is NO solution to make OIIO working with OpenJPEG 2.1. According to Matthias Fauconneau (aka mfv) Larry is working on the patch to get OIIO work with OpenJPEG 2.1, but it'll take some time still. I've tried to look into support of some sort of build system flag and do ifdefs, but it all becomes quite nasty, especially with bundled OpenJPEG bumped to 2.1. Surely such an update is something we'll have to apply to but at this exact moment it causes quite some pain for all developers. Suggest to wait for until OIIO supports OpenJPEG 2.1 and then go with the updates for real.
40 lines
1.1 KiB
C
40 lines
1.1 KiB
C
/* for BLENDER - we hand-maintain this,
|
|
* for the original OpenJpeg package it is generated,
|
|
* the endian check is a blender define */
|
|
|
|
/* create config.h for CMake */
|
|
#define PACKAGE_VERSION "1.5.2"
|
|
|
|
#define HAVE_INTTYPES_H
|
|
#define HAVE_MEMORY_H
|
|
#define HAVE_STDINT_H
|
|
#define HAVE_STDLIB_H
|
|
#define HAVE_STRINGS_H
|
|
#define HAVE_STRING_H
|
|
#define HAVE_SYS_STAT_H
|
|
#define HAVE_SYS_TYPES_H
|
|
#define HAVE_UNISTD_H
|
|
/* #define HAVE_LIBPNG */
|
|
/* #define HAVE_PNG_H */
|
|
/* #define HAVE_LIBTIFF */
|
|
/* #define HAVE_TIFF_H */
|
|
|
|
/* #undef HAVE_LIBLCMS1 */
|
|
/* #undef HAVE_LIBLCMS2 */
|
|
/* #undef HAVE_LCMS1_H */
|
|
/* #undef HAVE_LCMS2_H */
|
|
/* #undef USE_SYSTEM_GETOPT */
|
|
|
|
/* Byte order. */
|
|
/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or
|
|
__LITTLE_ENDIAN__ to match the endianness of the architecture being
|
|
compiled for. This is not necessarily the same as the architecture of the
|
|
machine doing the building. In order to support Universal Binaries on
|
|
Mac OS X, we prefer those defines to decide the endianness.
|
|
On other platforms we use the result of the TRY_RUN. */
|
|
#if defined(__BIG_ENDIAN__)
|
|
# define OPJ_BIG_ENDIAN
|
|
#else
|
|
# undef OPJ_BIG_ENDIAN
|
|
#endif
|