diff options
-rw-r--r-- | Makefile | 45 | ||||
-rw-r--r-- | Makethird | 86 | ||||
-rw-r--r-- | docs/example.c | 10 | ||||
-rw-r--r-- | docs/multi-threaded.c | 9 | ||||
-rw-r--r-- | platform/ios/MuPDF.xcodeproj/project.pbxproj | 35 |
5 files changed, 42 insertions, 143 deletions
@@ -18,16 +18,10 @@ include Makethird CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN) LIBS += $(XLIBS) -lm -THIRD_LIBS += $(FREETYPE_LIB) -THIRD_LIBS += $(JBIG2DEC_LIB) -THIRD_LIBS += $(JPEG_LIB) -THIRD_LIBS += $(OPENJPEG_LIB) -THIRD_LIBS += $(OPENSSL_LIB) -THIRD_LIBS += $(ZLIB_LIB) - LIBS += $(FREETYPE_LIBS) LIBS += $(JBIG2DEC_LIBS) LIBS += $(JPEG_LIBS) +LIBS += $(MUJS_LIBS) LIBS += $(OPENJPEG_LIBS) LIBS += $(OPENSSL_LIBS) LIBS += $(ZLIB_LIBS) @@ -35,6 +29,7 @@ LIBS += $(ZLIB_LIBS) CFLAGS += $(FREETYPE_CFLAGS) CFLAGS += $(JBIG2DEC_CFLAGS) CFLAGS += $(JPEG_CFLAGS) +CFLAGS += $(MUJS_CFLAGS) CFLAGS += $(OPENJPEG_CFLAGS) CFLAGS += $(OPENSSL_CFLAGS) CFLAGS += $(ZLIB_CFLAGS) @@ -98,13 +93,8 @@ CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC)))) HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC)))) GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC)))) -# --- Choice of Javascript library --- - ifeq "$(HAVE_MUJS)" "yes" PDF_OBJ += $(OUT)/pdf/js/pdf-js.o -THIRD_LIBS += $(MUJS_LIB) -LIBS += $(MUJS_LIBS) -CFLAGS += $(MUJS_CFLAGS) else PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o endif @@ -118,11 +108,16 @@ $(GPRF_OBJ) : $(FITZ_HDR) $(GPRF_HDR) $(GPRF_SRC_HDR) # --- Library --- -MUPDF_LIB := $(OUT)/libmupdf.a +MUPDF_LIB = $(OUT)/libmupdf.a +THIRD_LIB = $(OUT)/libmupdfthird.a + +MUPDF_OBJ := $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) +THIRD_OBJ := $(FREETYPE_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) -$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) +$(MUPDF_LIB) : $(MUPDF_OBJ) +$(THIRD_LIB) : $(THIRD_OBJ) -INSTALL_LIBS := $(MUPDF_LIB) +INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) # --- Rules --- @@ -234,19 +229,19 @@ $(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pd MUTOOL := $(addprefix $(OUT)/, mutool) MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o) $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) -$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB) $(MUTOOL) : $(MUTOOL_OBJ) $(LINK_CMD) MJSGEN := $(OUT)/mjsgen -$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB) $(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o) $(LINK_CMD) MUJSTEST := $(OUT)/mujstest MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o) $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR) -$(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB) $(MUJSTEST) : $(MUJSTEST_OBJ) $(LINK_CMD) @@ -254,7 +249,7 @@ ifeq "$(HAVE_X11)" "yes" MUVIEW_X11 := $(OUT)/mupdf-x11 MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR) -$(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB) $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) $(LINK_CMD) $(X11_LIBS) @@ -262,7 +257,7 @@ ifeq "$(HAVE_GLFW)" "yes" MUVIEW_GLFW := $(OUT)/mupdf-gl MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o) $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h -$(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIBS) $(GLFW_LIB) +$(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB) $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) $(LINK_CMD) $(GLFW_LIBS) endif @@ -271,7 +266,7 @@ ifeq "$(HAVE_CURL)" "yes" MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR) -$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB) +$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB) $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS) endif @@ -281,7 +276,7 @@ ifeq "$(HAVE_WIN32)" "yes" MUVIEW_WIN32 := $(OUT)/mupdf MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o) $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR) -$(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB) $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) $(LINK_CMD) $(WIN32_LIBS) endif @@ -295,9 +290,9 @@ INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL) examples: $(OUT)/example $(OUT)/multi-threaded -$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIBS) +$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIB) $(LINK_CMD) $(CFLAGS) -$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIBS) +$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB) $(LINK_CMD) $(CFLAGS) -lpthread # --- Update version string header --- @@ -326,7 +321,7 @@ incdir ?= $(prefix)/include mandir ?= $(prefix)/share/man docdir ?= $(prefix)/share/doc/mupdf -third: $(THIRD_LIBS) +third: $(THIRD_LIB) extra: $(CURL_LIB) $(GLFW_LIB) libs: $(INSTALL_LIBS) apps: $(INSTALL_APPS) @@ -11,51 +11,20 @@ JBIG2DEC_DIR := thirdparty/jbig2dec JPEG_DIR := thirdparty/jpeg MUJS_DIR := thirdparty/mujs OPENJPEG_DIR := thirdparty/openjpeg/libopenjpeg -OPENSSL_DIR := thirdparty/openssl ZLIB_DIR := thirdparty/zlib + CURL_DIR := thirdparty/curl GLFW_DIR := thirdparty/glfw -# --- V8 --- -# -# V8 is too big to be used as a submodule. -# - -V8_DIR := $(wildcard thirdparty/v8*) - -ifneq "$(V8_DIR)" "" - -ifeq "$(build)" "release" -V8_LIB_CHOICE := release -else ifeq "$(build)" "profile" -V8_LIB_CHOICE := release -else -V8_LIB_CHOICE := debug -endif - -V8_ARCH ?= x64 - -# If you are building for 32bit linux use V8_ARCH=ia32 -ifeq "$(OS)" "Darwin" -V8_LIBS := -L$(V8_DIR)/out-mac/$(V8_ARCH).$(V8_LIB_CHOICE)/ -lv8_base -lv8_snapshot -lstdc++ -else -V8_LIBS := -L$(V8_DIR)/out/$(V8_ARCH).$(V8_LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread -ldl -lstdc++ -endif - -V8_CFLAGS := -I$(V8_DIR)/include - -HAVE_V8 := yes -endif - # --- MuJS --- ifneq "$(wildcard $(MUJS_DIR)/README)" "" -MUJS_LIB := $(OUT)/libmujs.a MUJS_OUT := $(OUT)/mujs MUJS_SRC := one.c -$(MUJS_LIB): $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o)) +MUJS_OBJ := $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o)) + $(MUJS_OUT): $(MKDIR_CMD) $(MUJS_OUT)/%.o: $(MUJS_DIR)/%.c | $(MUJS_OUT) @@ -70,7 +39,6 @@ endif ifneq "$(wildcard $(FREETYPE_DIR)/README)" "" -FREETYPE_LIB := $(OUT)/libfreetype.a FREETYPE_OUT := $(OUT)/freetype FREETYPE_SRC := \ ftbase.c \ @@ -96,8 +64,7 @@ FREETYPE_SRC := \ type1.c \ type1cid.c \ - -$(FREETYPE_LIB): $(addprefix $(FREETYPE_OUT)/, $(FREETYPE_SRC:%.c=%.o)) +FREETYPE_OBJ := $(addprefix $(FREETYPE_OUT)/, $(FREETYPE_SRC:%.c=%.o)) $(FREETYPE_OUT): $(MKDIR_CMD) @@ -139,7 +106,6 @@ endif ifneq "$(wildcard $(JBIG2DEC_DIR)/README)" "" -JBIG2DEC_LIB := $(OUT)/libjbig2dec.a JBIG2DEC_OUT := $(OUT)/jbig2dec JBIG2DEC_SRC := \ jbig2.c \ @@ -158,7 +124,8 @@ JBIG2DEC_SRC := \ jbig2_symbol_dict.c \ jbig2_text.c \ -$(JBIG2DEC_LIB): $(addprefix $(JBIG2DEC_OUT)/, $(JBIG2DEC_SRC:%.c=%.o)) +JBIG2DEC_OBJ := $(addprefix $(JBIG2DEC_OUT)/, $(JBIG2DEC_SRC:%.c=%.o)) + $(JBIG2DEC_OUT): $(MKDIR_CMD) $(JBIG2DEC_OUT)/%.o: $(JBIG2DEC_DIR)/%.c | $(JBIG2DEC_OUT) @@ -174,7 +141,6 @@ endif ifneq "$(wildcard $(JPEG_DIR)/README)" "" -JPEG_LIB := $(OUT)/libjpeg.a JPEG_OUT := $(OUT)/jpeg JPEG_SRC := \ jaricom.c \ @@ -208,7 +174,8 @@ JPEG_SRC := \ jquant2.c \ jutils.c \ -$(JPEG_LIB): $(addprefix $(JPEG_OUT)/, $(JPEG_SRC:%.c=%.o)) +JPEG_OBJ := $(addprefix $(JPEG_OUT)/, $(JPEG_SRC:%.c=%.o)) + $(JPEG_OUT): $(MKDIR_CMD) $(JPEG_OUT)/%.o: $(JPEG_DIR)/%.c | $(JPEG_OUT) @@ -224,7 +191,6 @@ endif ifneq "$(wildcard $(OPENJPEG_DIR)/CMakeLists.txt)" "" -OPENJPEG_LIB := $(OUT)/libopenjpeg.a OPENJPEG_OUT := $(OUT)/openjpeg OPENJPEG_SRC := \ bio.c \ @@ -252,7 +218,8 @@ OPENJPEG_SRC := \ thix_manager.c \ tpix_manager.c \ -$(OPENJPEG_LIB): $(addprefix $(OPENJPEG_OUT)/, $(OPENJPEG_SRC:%.c=%.o)) +OPENJPEG_OBJ := $(addprefix $(OPENJPEG_OUT)/, $(OPENJPEG_SRC:%.c=%.o)) + $(OPENJPEG_OUT): $(MKDIR_CMD) $(OPENJPEG_OUT)/%.o: $(OPENJPEG_DIR)/%.c | $(OPENJPEG_OUT) @@ -268,7 +235,6 @@ endif ifneq "$(wildcard $(ZLIB_DIR)/README)" "" -ZLIB_LIB := $(OUT)/libz.a ZLIB_OUT := $(OUT)/zlib ZLIB_SRC := \ adler32.c \ @@ -286,7 +252,8 @@ ZLIB_SRC := \ gzclose.c \ gzread.c \ -$(ZLIB_LIB): $(addprefix $(ZLIB_OUT)/, $(ZLIB_SRC:%.c=%.o)) +ZLIB_OBJ := $(addprefix $(ZLIB_OUT)/, $(ZLIB_SRC:%.c=%.o)) + $(ZLIB_OUT): $(MKDIR_CMD) $(ZLIB_OUT)/%.o: $(ZLIB_DIR)/%.c | $(ZLIB_OUT) @@ -298,34 +265,6 @@ ZLIB_CFLAGS := $(SYS_ZLIB_CFLAGS) ZLIB_LIBS := $(SYS_ZLIB_LIBS) endif -# --- OpenSSL --- - -ifneq "$(wildcard $(OPENSSL_DIR)/README)" "" - -OPENSSL_LIB := $(OUT)/libcrypto.a - -OPENSSL_DIR_MAK := $(OPENSSL_DIR)/Makefile -OPENSSL_DIR_LIB := $(OPENSSL_DIR)/libcrypto.a - -$(OPENSSL_DIR_MAK): - cd $(OPENSSL_DIR) && ./config no-threads no-zlib no-shared no-asm no-dso - -$(OPENSSL_DIR_LIB): $(OPENSSL_DIR_MAK) - $(MAKE) -C $(OPENSSL_DIR) build_crypto - -$(OPENSSL_LIB): $(OPENSSL_DIR_LIB) | $(OUT) - cp $(OPENSSL_DIR_LIB) $(OPENSSL_LIB) - -openssl-clean: - $(MAKE) -C $(OPENSSL_DIR) clean - rm -f thirdparty/openssl/Makefile thirdparty/openssl/libcrypto.a - -OPENSSL_CFLAGS := -DHAVE_OPENSSL -I$(OPENSSL_DIR)/include -else -OPENSSL_CFLAGS := $(SYS_OPENSSL_CFLAGS) -OPENSSL_LIBS := $(SYS_OPENSSL_LIBS) -endif - # --- cURL --- ifneq "$(wildcard $(CURL_DIR)/README)" "" @@ -443,7 +382,6 @@ CURL_SRC := \ warnless.c \ wildcard.c \ - $(CURL_LIB): $(addprefix $(CURL_OUT)/, $(CURL_SRC:%.c=%.o)) $(CURL_OUT): diff --git a/docs/example.c b/docs/example.c index 3099ecb1..231bbaeb 100644 --- a/docs/example.c +++ b/docs/example.c @@ -4,13 +4,9 @@ Build the mupdf library using make, then either run 'make examples' or compile the example manually: - gcc -Iinclude -o example.exe docs/example.c build/debug/libmupdf.a \ - build/debug/libfreetype.a \ - build/debug/libjbig2dec.a \ - build/debug/libjpeg.a \ - build/debug/libmujs.a \ - build/debug/libopenjpeg.a \ - build/debug/libz.a \ + gcc -Iinclude -o example.exe docs/example.c \ + build/debug/libmupdf.a \ + build/debug/libmupdfthird.a -lcrypto \ -lm diff --git a/docs/multi-threaded.c b/docs/multi-threaded.c index eb66db07..a8e2d204 100644 --- a/docs/multi-threaded.c +++ b/docs/multi-threaded.c @@ -15,13 +15,8 @@ // // gcc -g -o build/debug/example-mt -Iinclude docs/multi-threaded.c \ // build/debug/libmupdf.a \ -// build/debug/libfreetype.a build/debug/libjbig2dec.a \ -// build/debug/libjpeg.a build/debug/libopenjpeg.a \ -// build/debug/libmujs.a \ -// build/debug/libz.a -lpthread -lm -// -// (If this fails with errors about missing BIO_ and X509_ references -// try again with "-lcrypto" added to the end of that command). +// build/debug/libmupdfthird.a \ +// -lpthread -lcrypto -lm // // build/debug/example-mt /path/to/document.pdf // diff --git a/platform/ios/MuPDF.xcodeproj/project.pbxproj b/platform/ios/MuPDF.xcodeproj/project.pbxproj index 143557bb..b1470ba5 100644 --- a/platform/ios/MuPDF.xcodeproj/project.pbxproj +++ b/platform/ios/MuPDF.xcodeproj/project.pbxproj @@ -10,13 +10,8 @@ 7C6152E819DDD6A90095ECAC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7C6152E719DDD6A90095ECAC /* Images.xcassets */; }; 7C6152EA19DDF05B0095ECAC /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C6152E919DDF05B0095ECAC /* Launch Screen.xib */; }; 96C8ED011779A88E00A30AF4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 96C8ED001779A88E00A30AF4 /* main.m */; }; - 96C8ED181779A9AE00A30AF4 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED111779A9AE00A30AF4 /* libfreetype.a */; }; - 96C8ED191779A9AE00A30AF4 /* libjbig2dec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED121779A9AE00A30AF4 /* libjbig2dec.a */; }; - 96C8ED1A1779A9AF00A30AF4 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED131779A9AE00A30AF4 /* libjpeg.a */; }; - 96C8ED1B1779A9AF00A30AF4 /* libmujs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED141779A9AE00A30AF4 /* libmujs.a */; }; + 96C8ED1B1779A9AF00A30AF4 /* libmupdfthird.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED141779A9AE00A30AF4 /* libmupdfthird.a */; }; 96C8ED1C1779A9AF00A30AF4 /* libmupdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED151779A9AE00A30AF4 /* libmupdf.a */; }; - 96C8ED1D1779A9AF00A30AF4 /* libopenjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED161779A9AE00A30AF4 /* libopenjpeg.a */; }; - 96C8ED1E1779A9AF00A30AF4 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C8ED171779A9AE00A30AF4 /* libz.a */; }; 96E1CDF31779A60700FCF717 /* x_alt_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDEC1779A60700FCF717 /* x_alt_blue.png */; }; 96E1CDF41779A60700FCF717 /* x_alt_blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96E1CDED1779A60700FCF717 /* x_alt_blue@2x.png */; }; DA0354EB18FFF48400EE31BA /* MuPrintPageRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0354EA18FFF48400EE31BA /* MuPrintPageRenderer.m */; }; @@ -75,13 +70,8 @@ 968E1E3D1779A54F0050CEA3 /* MuPDF.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MuPDF.app; sourceTree = BUILT_PRODUCTS_DIR; }; 968E1E481779A54F0050CEA3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 96C8ED001779A88E00A30AF4 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; - 96C8ED111779A9AE00A30AF4 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 96C8ED121779A9AE00A30AF4 /* libjbig2dec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjbig2dec.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 96C8ED131779A9AE00A30AF4 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjpeg.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 96C8ED141779A9AE00A30AF4 /* libmujs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmujs.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 96C8ED141779A9AE00A30AF4 /* libmupdfthird.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmupdfthird.a; sourceTree = BUILT_PRODUCTS_DIR; }; 96C8ED151779A9AE00A30AF4 /* libmupdf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmupdf.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 96C8ED161779A9AE00A30AF4 /* libopenjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopenjpeg.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 96C8ED171779A9AE00A30AF4 /* libz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libz.a; sourceTree = BUILT_PRODUCTS_DIR; }; 96E1CDEC1779A60700FCF717 /* x_alt_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x_alt_blue.png; sourceTree = "<group>"; }; 96E1CDED1779A60700FCF717 /* x_alt_blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "x_alt_blue@2x.png"; sourceTree = "<group>"; }; DA012CA218803D1C00E47712 /* MuUpdater.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MuUpdater.h; path = Classes/MuUpdater.h; sourceTree = "<group>"; }; @@ -151,12 +141,7 @@ buildActionMask = 2147483647; files = ( 96C8ED1C1779A9AF00A30AF4 /* libmupdf.a in Frameworks */, - 96C8ED1B1779A9AF00A30AF4 /* libmujs.a in Frameworks */, - 96C8ED181779A9AE00A30AF4 /* libfreetype.a in Frameworks */, - 96C8ED191779A9AE00A30AF4 /* libjbig2dec.a in Frameworks */, - 96C8ED1A1779A9AF00A30AF4 /* libjpeg.a in Frameworks */, - 96C8ED1D1779A9AF00A30AF4 /* libopenjpeg.a in Frameworks */, - 96C8ED1E1779A9AF00A30AF4 /* libz.a in Frameworks */, + 96C8ED1B1779A9AF00A30AF4 /* libmupdfthird.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -183,12 +168,7 @@ children = ( 968E1E3D1779A54F0050CEA3 /* MuPDF.app */, 96C8ED151779A9AE00A30AF4 /* libmupdf.a */, - 96C8ED141779A9AE00A30AF4 /* libmujs.a */, - 96C8ED111779A9AE00A30AF4 /* libfreetype.a */, - 96C8ED121779A9AE00A30AF4 /* libjbig2dec.a */, - 96C8ED131779A9AE00A30AF4 /* libjpeg.a */, - 96C8ED161779A9AE00A30AF4 /* libopenjpeg.a */, - 96C8ED171779A9AE00A30AF4 /* libz.a */, + 96C8ED141779A9AE00A30AF4 /* libmupdfthird.a */, ); name = Products; sourceTree = "<group>"; @@ -392,12 +372,7 @@ ); outputPaths = ( "$(DERIVED_FILE_DIR)/libmupdf.a", - "$(DERIVED_FILE_DIR)/libmujs.a", - "$(DERIVED_FILE_DIR)/libfreetype.a", - "$(DERIVED_FILE_DIR)/libjbig2dec.a", - "$(DERIVED_FILE_DIR)/libjpeg.a", - "$(DERIVED_FILE_DIR)/libopenjpeg.a", - "$(DERIVED_FILE_DIR)/libz.a", + "$(DERIVED_FILE_DIR)/libmupdfthird.a", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; |