diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2016-04-13 02:38:18 +0200 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-04-22 17:26:48 +0100 |
| commit | f88bfe2e62dbadb96d4f52d7aa025f0a516078da (patch) | |
| tree | f14f1209973ebbf40066124596892b1eeee1f1f8 /Makethird | |
| parent | b26c446dfa9d6059b5bd52025c7a70e8b5d3411b (diff) | |
| download | mupdf-f88bfe2e62dbadb96d4f52d7aa025f0a516078da.tar.xz | |
thirdparty: Update to openjpeg 2.1.0.
Diffstat (limited to 'Makethird')
| -rw-r--r-- | Makethird | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -11,7 +11,7 @@ HARFBUZZ_DIR := thirdparty/harfbuzz JBIG2DEC_DIR := thirdparty/jbig2dec JPEG_DIR := thirdparty/jpeg MUJS_DIR := thirdparty/mujs -OPENJPEG_DIR := thirdparty/openjpeg/libopenjpeg +OPENJPEG_DIR := thirdparty/openjpeg/src/lib/openjp2 ZLIB_DIR := thirdparty/zlib CURL_DIR := thirdparty/curl @@ -273,7 +273,6 @@ OPENJPEG_SRC := \ mct.c \ mqc.c \ openjpeg.c \ - opj_clock.c \ phix_manager.c \ pi.c \ ppix_manager.c \ @@ -292,7 +291,7 @@ $(OPENJPEG_OUT): $(OPENJPEG_OUT)/%.o: $(OPENJPEG_DIR)/%.c | $(OPENJPEG_OUT) $(CC_CMD) -DOPJ_STATIC -DOPJ_HAVE_STDINT_H -OPENJPEG_CFLAGS += -Iscripts/openjpeg -I$(OPENJPEG_DIR) +OPENJPEG_CFLAGS += -I$(OPENJPEG_DIR) -DOPJ_HAVE_INTTYPES_H=1 -DUSE_JPIP=1 else OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS) OPENJPEG_LIBS := $(SYS_OPENJPEG_LIBS) |