From cc89add2a44a343542ec33b614b0736452d077f1 Mon Sep 17 00:00:00 2001
From: "Zephaniah E. Hull" <warp@babylon.d2dc.net>
Date: Sat, 25 Dec 1999 18:03:05 +0000
Subject: [PATCH] Moved keys.h to qw_common. Added rules to allow
 gl-client-glide to compile.

---
 qw_client/Makefile              | 15 ++++++++-------
 {qw_client => qw_common}/keys.h |  0
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename {qw_client => qw_common}/keys.h (100%)

diff --git a/qw_client/Makefile b/qw_client/Makefile
index 15fd61d..3df148f 100644
--- a/qw_client/Makefile
+++ b/qw_client/Makefile
@@ -43,6 +43,7 @@ LDFLAGS=-lm
 SVGA_LDFLAGS=$(LDFLAGS) -lvga
 X11_LDFLAGS=-L$(X11_DIR)/lib $(LDFLAGS) -lX11 -lXext
 GL_X11_LDFLAGS=-L$(X11_DIR)/lib $(LDFLAGS) -lGL -lX11 -lXext
+GL_SVGA_LDFLAGS=-L$(X11_DIR)/lib -lvga -lMesaGL -lglide2x -lX11 -lXext
 
 DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
 DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
@@ -58,8 +59,8 @@ DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $<
 
 SOFT_TARGETS=$(OBJ_DIR)/qw-client-svga \
 	$(OBJ_DIR)/qw-client-x
-GL_TARGETS=$(OBJ_DIR)/qw-client-gl# \
-#	$(OBJ_DIR)/qw-client-3dfx
+GL_TARGETS=$(OBJ_DIR)/qw-client-gl \
+	$(OBJ_DIR)/qw-client-glide
 
 debug:		debug-soft debug-gl
 
@@ -511,11 +512,11 @@ GL_OBJS = \
 	$(OBJ_DIR)/gl_obj/snd_mixa.o \
 	$(OBJ_DIR)/gl_obj/sys_dosa.o
 	
-#GL_SVGA_OBJS = $(OBJ_DIR)/gl_obj/gl_vidlinux.o
+GL_SVGA_OBJS = $(OBJ_DIR)/gl_obj/gl_vidlinux.o
 GL_X11_OBJS = $(OBJ_DIR)/gl_obj/gl_vidlinuxglx.o
 
-#$(OBJ_DIR)/qw-client-glide:	$(GL_OBJS) $(GL_SVGA_OBJS)
-#	$(CC) $(CFLAGS) -o $@ $(GL_OBJS) $(GL_SVGA_OBJS) $(LDFLAGS) $(GL_SVGA_LDFLAGS)
+$(OBJ_DIR)/qw-client-glide:	$(GL_OBJS) $(GL_SVGA_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(GL_OBJS) $(GL_SVGA_OBJS) $(LDFLAGS) $(GL_SVGA_LDFLAGS)
 
 $(OBJ_DIR)/qw-client-gl:	$(GL_OBJS) $(GL_X11_OBJS)
 	$(CC) $(CFLAGS) -o $@ $(GL_OBJS) $(GL_X11_OBJS) $(LDFLAGS) $(GL_X11_LDFLAGS)
@@ -655,8 +656,8 @@ $(OBJ_DIR)/gl_obj/gl_rsurf.o:	$(CLIENT_DIR)/gl_rsurf.c
 $(OBJ_DIR)/gl_obj/gl_screen.o:	$(CLIENT_DIR)/gl_screen.c
 	$(DO_GL_CC)
 
-#$(OBJ_DIR)/gl_obj/gl_vidlinux.o: $(CLIENT_DIR)/gl_vidlinux.c
-#	$(DO_GL_CC)
+$(OBJ_DIR)/gl_obj/gl_vidlinux.o: $(CLIENT_DIR)/gl_vidlinux.c
+	$(DO_GL_CC)
 
 $(OBJ_DIR)/gl_obj/gl_vidlinuxglx.o: $(COMMON_DIR)/gl_vidlinuxglx.c
 	$(DO_GL_CC)
diff --git a/qw_client/keys.h b/qw_common/keys.h
similarity index 100%
rename from qw_client/keys.h
rename to qw_common/keys.h