From 2e0aa06503b8641408842176152bd0019fe6b8cb Mon Sep 17 00:00:00 2001
From: Robin Watts <robin.watts@artifex.com>
Date: Mon, 7 Jan 2013 16:00:07 +0000
Subject: Update OpenJPEG to v2.0.0.

---
 Makethird | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Makethird')

diff --git a/Makethird b/Makethird
index 42264faf..06824601 100644
--- a/Makethird
+++ b/Makethird
@@ -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)
-- 
cgit v1.2.3