From bdad9d2713be21c2ee092cbdf1c7e75d6ba3cba3 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 1 Apr 2015 11:17:17 +0200 Subject: 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. --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 55217c94..800b72eb 100644 --- a/Makefile +++ b/Makefile @@ -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) -- cgit v1.2.3