diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-01-07 16:00:07 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-22 15:27:16 +0100 |
| commit | 2e0aa06503b8641408842176152bd0019fe6b8cb (patch) | |
| tree | 53e441fbe57b574fea0724893603ee5668c0471b /Makethird | |
| parent | 12011c9168471b2dd8012165c9d127a46b7c6bcb (diff) | |
| download | mupdf-2e0aa06503b8641408842176152bd0019fe6b8cb.tar.xz | |
Update OpenJPEG to v2.0.0.
Diffstat (limited to 'Makethird')
| -rw-r--r-- | Makethird | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -186,7 +186,7 @@ endif # --- OpenJPEG --- ifneq "$(wildcard $(OPENJPEG_DIR)/README)" "" -CFLAGS += -I$(OPENJPEG_DIR)/libopenjpeg +CFLAGS += -I$(OPENJPEG_DIR)/src/lib/openjp2 -DOPJ_STATIC -DOPJ_HAVE_STDINT_H -DHAVE_SSIZE_T -DHAVE_INTTYPES_H LIBS := $(filter-out -lopenjpeg, $(LIBS)) OPENJPEG_LIB := $(OUT)/libopenjpeg.a @@ -196,14 +196,15 @@ OPENJPEG_SRC := \ cio.c \ dwt.c \ event.c \ + function_list.c \ image.c \ + invert.c \ j2k.c \ - j2k_lib.c \ jp2.c \ - jpt.c \ mct.c \ mqc.c \ openjpeg.c \ + opj_clock.c \ phix_manager.c \ pi.c \ ppix_manager.c \ @@ -216,8 +217,8 @@ OPENJPEG_SRC := \ tpix_manager.c \ $(OPENJPEG_LIB): $(addprefix $(OUT)/opj_, $(OPENJPEG_SRC:%.c=%.o)) -$(OUT)/opj_%.o: $(OPENJPEG_DIR)/libopenjpeg/%.c | $(OUT) - $(CC_CMD) -DOPJ_STATIC +$(OUT)/opj_%.o: $(OPENJPEG_DIR)/src/lib/openjp2/%.c | $(OUT) + $(CC_CMD) else SYS_OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS) CFLAGS += $(SYS_OPENJPEG_CFLAGS) |