From 896830e23e8f94b17bdf386c191a885c972ea8a8 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Tue, 26 Sep 2017 23:45:31 +0200
Subject: gl: Remove GLFW and reinstate FreeGLUT.

GLFW doesn't build on Visual Studio 2005 anymore, and I don't have time to keep
up with the changes.

So, we're switching back to FreeGLUT, which is more stable.

I've added the two missing features that made us switch to GLFW in the first
place: input methods and system clipboard support.

If MuPDF is compiled with our version of FreeGLUT, we now use these functions:

	* glutKeyboardExtFunc
	* glutSetClipboard
	* glutGetClipboard
---
 Makerules | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makerules')

diff --git a/Makerules b/Makerules
index 56ba6ef4..41624178 100644
--- a/Makerules
+++ b/Makerules
@@ -114,6 +114,10 @@ HAVE_PTHREAD := yes
 SYS_PTHREAD_CFLAGS :=
 SYS_PTHREAD_LIBS := -lpthread
 
+HAVE_GLUT := yes
+SYS_GLUT_CFLAGS :=
+SYS_GLUT_LIBS := -lglut -lGL
+
 ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
 HAVE_LIBCRYPTO := yes
 SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
@@ -280,5 +284,5 @@ endif
 # TODO: If crosscompiling, why not just call "make libs" instead of this exception?
 ifeq "$(CROSSCOMPILE)" "yes"
 HAVE_X11 ?= no
-HAVE_GLFW ?= no
+HAVE_GLUT ?= no
 endif
-- 
cgit v1.2.3