Merge pull request #194 from chrox/master

fix undefined symbol from libmujs when loading mupdf on Android
koreader · Jul 1, 2014 · 3672c27 · 3672c27
2 parents 9eeaed7 + ffaf1bc
commit 3672c27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -107,6 +107,7 @@ $(MUPDF_LIB): $(JPEG_LIB) $(FREETYPE_LIB)
 		$(CFLAGS) \
 		-Wl,-E -Wl,-rpath,'$$ORIGIN' \
 		-Wl,--whole-archive $(MUPDF_LIB_STATIC) \
+		-Wl,--whole-archive $(MUPDF_JS_LIB_STATIC) \
 		-Wl,--no-whole-archive $(MUPDF_THIRDPARTY_LIBS) \
 		-Wl,-soname=$(notdir $(MUPDF_LIB)) \
 		$(JPEG_LIB) $(FREETYPE_LIB) \

diff --git a/Makefile.defs b/Makefile.defs
@@ -147,7 +147,7 @@ MUPDF_DIR=mupdf
 Z_LIB=$(MUPDF_LIB_DIR)/libz.a
 MUPDF_LIB_DIR=$(MUPDF_DIR)/build/release
 MUPDF_LIB_STATIC=$(MUPDF_LIB_DIR)/libmupdf.a
-MUPDF_JS_LIB_STATIC=$(MUPDF_LIB_DIR)/libmupdf-js-none.a
+MUPDF_JS_LIB_STATIC=$(MUPDF_LIB_DIR)/libmujs.a
 MUPDF_THIRDPARTY_LIBS=$(MUPDF_LIB_DIR)/libopenjpeg.a \
 			$(MUPDF_LIB_DIR)/libjbig2dec.a \
 			$(Z_LIB)