diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2017-11-17 14:44:51 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2017-11-17 14:47:31 +0100 |
| commit | 74a8100804c8f18e1e2a71435b1e191df49e81fd (patch) | |
| tree | 59a0bf26aa71d303b6c1997f7bb11644e525a32a | |
| parent | a3979090efc4463e033b701089afa42312df7f6e (diff) | |
| download | mupdf-74a8100804c8f18e1e2a71435b1e191df49e81fd.tar.xz | |
Fix build if lcms2 is not present.
We NEED lcms2art (the artifex branch) and cannot build with stock lcms2.
Disable ICC support if the lcms2 thirdparty library is not present.
| -rw-r--r-- | Makerules | 5 | ||||
| -rw-r--r-- | Makethird | 3 | ||||
| -rw-r--r-- | source/fitz/color-lcms.c | 3 |
3 files changed, 4 insertions, 7 deletions
@@ -136,11 +136,6 @@ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) endif -ifeq "$(shell pkg-config --exists lcms2 && echo yes)" "yes" -SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2) -SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2) -endif - SYS_JBIG2DEC_LIBS := -ljbig2dec SYS_LIBJPEG_LIBS := -ljpeg SYS_ZLIB_LIBS := -lz @@ -575,8 +575,7 @@ $(LCMS2_OUT)/%.o: $(LCMS2_DIR)/src/%.c | $(LCMS2_OUT) LCMS2_CFLAGS := -I$(LCMS2_DIR)/include else -LCMS2_CFLAGS := $(SYS_LCMS2_CFLAGS) -LCMS2_LIBS := $(SYS_LCMS2_LIBS) +LCMS2_CFLAGS := -DNO_ICC endif # --- cURL --- diff --git a/source/fitz/color-lcms.c b/source/fitz/color-lcms.c index 604573cb..93a5e415 100644 --- a/source/fitz/color-lcms.c +++ b/source/fitz/color-lcms.c @@ -1,4 +1,6 @@ #include "mupdf/fitz.h" + +#ifndef NO_ICC #include "lcms2art.h" #include "lcms2art_plugin.h" #include "colorspace-imp.h" @@ -356,3 +358,4 @@ fz_cmm_engine fz_cmm_engine_lcms = { fz_lcms_fin_profile, cmsFLAGS_NOWHITEONWHITEFIXUP }; +#endif |