diff options
author | Wouter van Kesteren <woutershep@gmail.com> | 2012-11-06 22:53:44 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2012-11-16 14:05:07 +0100 |
commit | cb381546e5fb73110f09e0720645e3db34a03f98 (patch) | |
tree | e2d4c74bf517def02ae720984516411cce91501c | |
parent | fc3fb00dc71b796bb28c0ef7957f1ef630033516 (diff) | |
download | mupdf-cb381546e5fb73110f09e0720645e3db34a03f98.tar.xz |
Fix build with openjpeg-1.5.1
-rw-r--r-- | Makerules | 1 | ||||
-rw-r--r-- | Makethird | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -25,6 +25,7 @@ endif ifeq "$(OS)" "Linux" SYS_FREETYPE_INC := `pkg-config --cflags freetype2` +SYS_OPENJPEG_INC := `pkg-config --cflags libopenjpeg` X11_LIBS := -lX11 -lXext endif @@ -217,6 +217,8 @@ OPENJPEG_SRC := \ $(OPENJPEG_LIB): $(addprefix $(OUT)/opj_, $(OPENJPEG_SRC:%.c=%.o)) $(OUT)/opj_%.o: $(OPENJPEG_DIR)/libopenjpeg/%.c | $(OUT) $(CC_CMD) -DOPJ_STATIC +else +CFLAGS += $(SYS_OPENJPEG_INC) endif # --- ZLIB --- |