summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2013-07-17 17:32:12 +0100
committerRobin Watts <robin.watts@artifex.com>2013-07-19 19:56:27 +0100
commit42eb247ea0c69ba8cc249b1bb44fafcdcbdd2621 (patch)
tree6fde9d99a9551faa8abc6e0d4d3aa24db5824e4f /Makefile
parent90d1d2cf603ba9d61e8160c0ba12325cd8249034 (diff)
downloadmupdf-42eb247ea0c69ba8cc249b1bb44fafcdcbdd2621.tar.xz
Add mupdf-curl app
Windows and X11. Allows files to be fetched and displayed as they are downloaded both with and without linearization, using hints if available.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6f2dbbc1..2e72fbe4 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,11 @@ $(OUT)/%.o : scripts/%.c | $(OUT)
$(CC_CMD)
$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR)
- $(CC_CMD) $(X11_CFLAGS)
+ $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS)
+
+$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
+ mkdir -p $(OUT)/platform/x11/curl
+ $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
@@ -234,6 +238,11 @@ MUVIEW_X11 := $(OUT)/mupdf-x11
$(MUVIEW_X11) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS)
$(MUVIEW_X11) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
$(LINK_CMD) $(X11_LIBS)
+
+MUVIEW_X11_CURL := $(OUT)/mupdf-curl
+$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) $(CURL_LIB)
+$(MUVIEW_X11_CURL) : $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
+ $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS)
endif
ifeq "$(V8_PRESENT)" "yes"
@@ -247,8 +256,9 @@ endif
MUVIEW := $(MUVIEW_X11)
MUVIEW_V8 := $(MUVIEW_X11_V8)
+MUVIEW_CURL := $(MUVIEW_X11_CURL)
-INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST_V8) $(MUVIEW_V8)
+INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST_V8) $(MUVIEW_V8) $(MUVIEW_X11_CURL)
# --- Format man pages ---