summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2015-04-02 15:03:32 +0200
committerRobin Watts <robin.watts@artifex.com>2015-04-07 13:35:05 +0100
commit5d48119d15057c080ff0bc48da7878d234e4b703 (patch)
tree56f745aa5e31814cd02e35467f67efc99777f88a /Makefile
parent2b36d199c5e9cbf6b94f547ec9e3def61ab17233 (diff)
downloadmupdf-5d48119d15057c080ff0bc48da7878d234e4b703.tar.xz
Compile windows resource file when building with MinGW.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cbfd2c47..1b328d6d 100644
--- a/Makefile
+++ b/Makefile
@@ -154,6 +154,9 @@ $(OUT)/%.o : scripts/%.c | $(OUT)
$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR)
$(CC_CMD) $(X11_CFLAGS)
+$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT)
+ windres $< $@
+
$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
$(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
@@ -276,7 +279,7 @@ endif
ifeq "$(HAVE_WIN32)" "yes"
MUVIEW_WIN32 := $(OUT)/mupdf
-MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o)
+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) : $(MUVIEW_WIN32_OBJ)