diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-07-13 18:40:18 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-07-13 18:41:51 +0100 |
| commit | ed8501ed7f52ba96cbdf12594340e629ab99beef (patch) | |
| tree | 3d668b88f07de854bd7ebc1d6c38d8482c9d1cbf | |
| parent | 21e188013cc9535c8e8615d58a4afa3bca65f544 (diff) | |
| download | mupdf-ed8501ed7f52ba96cbdf12594340e629ab99beef.tar.xz | |
Bug 696493: Fix MINGW build of viewer.
Adopt patch from Tamir Evan. Many thanks.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makerules | 15 |
2 files changed, 13 insertions, 6 deletions
@@ -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 @@ -63,7 +63,12 @@ endif # Windows (MINGW) build doesn't use system libraries. ifeq "$(OS)" "MINGW" +WINDRES = windres HAVE_X11 ?= no +HAVE_WIN32 = yes +CC=gcc +# Add flags required for Harfbuzz because of missing strdup +CFLAGS+= -U__STRICT_ANSI__ # Mac OS X doesn't have pkg-config so we hard code paths. else ifeq "$(OS)" "MACOS" @@ -184,14 +189,18 @@ ifeq "$(OS)" "w64_x86-cross-mingw32" CC = i686-w64-mingw32-gcc LD = i686-w64-mingw32-gcc AR = i686-w64-mingw32-ar +WINDRES = i686-w64-mingw32-windres CROSSCOMPILE=yes +HAVE_WIN32=yes endif ifeq "$(OS)" "w64_amd64-cross-mingw32" CC = x86_64-w64-mingw32-gcc LD = x86_64-w64-mingw32-gcc AR = x86_64-w64-mingw32-ar +WINDRES = x86-64-mingw32-windres CROSSCOMPILE=yes +HAVE_WIN32=yes endif ifeq "$(OS)" "pnacl-cross" @@ -244,12 +253,8 @@ LD = $(TIZEN_TOOLS)ld $(TIZEN_FLAGS) CROSSCOMPILE=yes endif -ifeq "$(OS)" "MINGW" -CC=gcc -# Add flags required for Harfbuzz because of missing strdup -CFLAGS+= -U__STRICT_ANSI__ +ifeq "$(HAVE_WIN32)" "yes" WIN32_LIBS=-lcomdlg32 -lgdi32 -HAVE_WIN32=yes LDFLAGS += -Wl,-subsystem,windows endif |