summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2016-07-13 18:40:18 +0100
committerRobin Watts <robin.watts@artifex.com>2016-07-13 18:41:51 +0100
commited8501ed7f52ba96cbdf12594340e629ab99beef (patch)
tree3d668b88f07de854bd7ebc1d6c38d8482c9d1cbf /Makefile
parent21e188013cc9535c8e8615d58a4afa3bca65f544 (diff)
downloadmupdf-ed8501ed7f52ba96cbdf12594340e629ab99beef.tar.xz
Bug 696493: Fix MINGW build of viewer.
Adopt patch from Tamir Evan. Many thanks.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cb4f40ff..ca06745a 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,7 @@ QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ;
QUIET_RM = @ echo ' ' ' ' RM $@ ;
QUIET_TAGS = @ echo ' ' ' ' TAGS $@ ;
+QUIET_WINDRES = @ echo ' ' ' ' WINDRES $@ ;
endif
CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
@@ -60,6 +61,7 @@ LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
RM_CMD = $(QUIET_RM) rm -f $@
TAGS_CMD = $(QUIET_TAGS) ctags $^
+WINRES_CMD = $(QUIET_WINDRES) $(WINDRES) $< $@
# --- File lists ---
@@ -191,7 +193,7 @@ $(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR)
$(CC_CMD) $(X11_CFLAGS)
$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT)
- windres $< $@
+ $(WINDRES_CMD)
$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
$(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL