From 4d7bf58d137d884e4eb0e81fd576031f069105cb Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Tue, 24 May 2016 18:41:52 +0200 Subject: Add optional support for Luratech JBIG2 decoder. If thirdparty/luratech is populated then this decoder will be preferred over jbig2dec (even if both are present). --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a1dee548..5ba326a8 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ LIBS += $(MUJS_LIBS) LIBS += $(OPENJPEG_LIBS) LIBS += $(OPENSSL_LIBS) LIBS += $(ZLIB_LIBS) +LIBS += $(LURATECH_LIBS) CFLAGS += $(FREETYPE_CFLAGS) CFLAGS += $(HARFBUZZ_CFLAGS) @@ -35,6 +36,7 @@ CFLAGS += $(MUJS_CFLAGS) CFLAGS += $(OPENJPEG_CFLAGS) CFLAGS += $(OPENSSL_CFLAGS) CFLAGS += $(ZLIB_CFLAGS) +CFLAGS += $(LURATECH_CFLAGS) # --- Commands --- @@ -145,7 +147,7 @@ MUPDF_LIB = $(OUT)/libmupdf.a THIRD_LIB = $(OUT)/libmupdfthird.a MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) -THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) +THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) : $(THIRD_OBJ) -- cgit v1.2.3