From e9f86e83bf50f5a80847d45ee5f682fb92f35ba1 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 24 Feb 2015 11:57:01 +0100 Subject: glut: Simple viewer using GLUT and fixed function OpenGL. --- Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 938ec742..d8eb37fe 100644 --- a/Makefile +++ b/Makefile @@ -71,6 +71,7 @@ ALL_DIR += $(OUT)/gprf ALL_DIR += $(OUT)/tools ALL_DIR += $(OUT)/platform/x11 ALL_DIR += $(OUT)/platform/x11/curl +ALL_DIR += $(OUT)/platform/glut FITZ_HDR := include/mupdf/fitz.h $(wildcard include/mupdf/fitz/*.h) PDF_HDR := include/mupdf/pdf.h $(wildcard include/mupdf/pdf/*.h) @@ -165,6 +166,9 @@ $(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT) $(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR) $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL +$(OUT)/platform/glut/%.o : platform/glut/%.c | $(ALL_DIR) + $(CC_CMD) $(GLUT_CFLAGS) + .PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules # --- Generated CMAP, FONT and JAVASCRIPT files --- @@ -265,6 +269,13 @@ $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS) $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) $(LINK_CMD) $(X11_LIBS) +ifeq "$(HAVE_GLUT)" "yes" +MUVIEW_GLUT := $(OUT)/mupdf-glut +$(MUVIEW_GLUT) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) +$(MUVIEW_GLUT) : $(addprefix $(OUT)/platform/glut/, glut-main.o) + $(LINK_CMD) $(GLUT_LIBS) +endif + ifeq "$(HAVE_CURL)" "yes" MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) @@ -284,7 +295,7 @@ $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) $(LINK_CMD) $(WIN32_LIBS) endif -MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) +MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLUT) MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL) INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL) -- cgit v1.2.3