Skip to content

Commit

Permalink
do not use mupdf in libk2pdfopt
Browse files Browse the repository at this point in the history
This will stop linking and (trying to) using mupdf in libk2pdfopt.
We didn't use the functionality anyway, and it produced funny error
messages (see koreader#288, koreader#286).

Needs koreader/libk2pdfopt#24

Fixes koreader#288
  • Loading branch information
hwhw committed Nov 30, 2014
1 parent 1bad814 commit 24cdc3b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,12 @@ $(POPEN_NOSHELL_LIB):
CFLAGS="$(CFLAGS) $(if $(ANDROID),--sysroot=$(SYSROOT),)"

# k2pdfopt, fetched via GIT as a submodule
$(K2PDFOPT_LIB) $(LEPTONICA_LIB) $(TESSERACT_LIB): $(PNG_LIB) $(ZLIB) $(MUPDF_LIB)
$(K2PDFOPT_LIB) $(LEPTONICA_LIB) $(TESSERACT_LIB): $(PNG_LIB) $(ZLIB)
$(MAKE) -j$(PROCESSORS) -C $(K2PDFOPT_DIR) BUILDMODE=shared \
$(if $(EMULATE_READER),,HOST=$(if $(ANDROID),"arm-linux",$(CHOST))) \
CC="$(CC)" CFLAGS="$(CFLAGS) -O3 -I../$(MUPDF_DIR)/include" \
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS) -I../$(MUPDF_DIR)/include" \
AR="$(AR)" ZLIB=../$(ZLIB) MUPDF_LIB=../$(MUPDF_LIB) \
CC="$(CC)" CFLAGS="$(CFLAGS)" \
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
AR="$(AR)" ZLIB=../$(ZLIB) \
LEPT_CFLAGS="$(CFLAGS) -I$(CURDIR)/$(ZLIB_DIR) -I$(CURDIR)/$(PNG_DIR)" \
LEPT_LDFLAGS="$(LDFLAGS) -L$(CURDIR)/$(ZLIB_DIR) -L$(CURDIR)/$(PNG_DIR)/lib" \
ZLIB_LDFLAGS="-Wl,-rpath-link,$(CURDIR)/$(ZLIB_DIR)" \
Expand Down
2 changes: 1 addition & 1 deletion libk2pdfopt
Submodule libk2pdfopt updated 1 files
+0 −2 willuslib/willus.h

0 comments on commit 24cdc3b

Please sign in to comment.