diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-04-01 11:17:17 +0200 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2015-04-01 11:01:01 +0100 |
| commit | bdad9d2713be21c2ee092cbdf1c7e75d6ba3cba3 (patch) | |
| tree | 3f41cf400fb99ae252730d48ed4b6b5db938c00a /Makefile | |
| parent | 0a039da57c4ad338ed6e6f818b480d2124223a6d (diff) | |
| download | mupdf-bdad9d2713be21c2ee092cbdf1c7e75d6ba3cba3.tar.xz | |
Fix build for MinGW.
The pdfapp files live in platform/x11 for both the X11 and win32 builds.
Our curl submodule does not build cleanly on MinGW, so skip that variant.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -276,20 +276,11 @@ endif ifeq "$(HAVE_WIN32)" "yes" MUVIEW_WIN32 := $(OUT)/mupdf -MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/win32/, win_main.o pdfapp.o) +MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o) $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS) $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) $(LINK_CMD) $(WIN32_LIBS) - -ifeq "$(HAVE_CURL)" "yes" -MUVIEW_WIN32_CURL := $(OUT)/mupdf-win32-curl -MUVIEW_WIN32_CURL_OBJ := $(addprefix $(OUT)/platform/win32/curl/, win_main.o pdfapp.o curl_stream.o) -$(MUVIEW_WIN32_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR) -$(MUVIEW_WIN32_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB) -$(MUVIEW_WIN32_CURL) : $(MUVIEW_WIN32_CURL_OBJ) - $(LINK_CMD) $(WIN32_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS) -endif endif MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) |