From f88bfe2e62dbadb96d4f52d7aa025f0a516078da Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Wed, 13 Apr 2016 02:38:18 +0200
Subject: thirdparty: Update to openjpeg 2.1.0.

---
 Makethird | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Makethird')

diff --git a/Makethird b/Makethird
index 464133fd..3a40fcb6 100644
--- a/Makethird
+++ b/Makethird
@@ -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)
-- 
cgit v1.2.3