From 2eb7912e6551ce054d4f5216119132514ec0d733 Mon Sep 17 00:00:00 2001
From: jpaana <>
Date: Sun, 21 Dec 2003 17:53:46 +0000
Subject: [PATCH] Added GL2 path

---
 linux/Makefile.i386linux | 6 +++++-
 sdl/Makefile.am          | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/linux/Makefile.i386linux b/linux/Makefile.i386linux
index e2a4185..8080195 100644
--- a/linux/Makefile.i386linux
+++ b/linux/Makefile.i386linux
@@ -40,7 +40,7 @@ PNG_LIBS      = -lpng -lz
 #OPENAL_LIBS   = -lopenal 
 #OPENAL_CFLAGS = -DOPENAL -I/usr/local/include/AL
 
-BASE_CFLAGS   = -DBASEDIR="$(MASTER_DIR)" -DUSERPREF_DIR $(OPENGL_CFLAGS) $(OPENAL_CFLAGS) -I$(MOUNT_DIR) $(XML_CFLAGS) -Did386=1
+BASE_CFLAGS   = -DBASEDIR="$(MASTER_DIR)" -DUSERPREF_DIR $(OPENGL_CFLAGS) $(OPENAL_CFLAGS) -I$(MOUNT_DIR) $(XML_CFLAGS) -DUSE_ASM
 RELEASE_CFLAGS = $(BASE_CFLAGS) -march=i686 -O2 -ffast-math -funroll-loops \
 	-fomit-frame-pointer -fexpensive-optimizations 
 DEBUG_CFLAGS  = $(BASE_CFLAGS) -g 
@@ -94,6 +94,7 @@ GLQUAKE_OBJS= \
 	$(BUILDDIR)/glquake/gl_bumpdriver.o \
 	$(BUILDDIR)/glquake/gl_bumpgf.o \
 	$(BUILDDIR)/glquake/gl_bumparb.o \
+	$(BUILDDIR)/glquake/gl_bumpgl2.o \
 	$(BUILDDIR)/glquake/gl_bumpmap.o \
 	$(BUILDDIR)/glquake/gl_bumpparhelia.o \
 	$(BUILDDIR)/glquake/gl_bumpradeon.o \
@@ -230,6 +231,9 @@ $(BUILDDIR)/glquake/gl_bumpgf.o :      $(MOUNT_DIR)/gl_bumpgf.c
 $(BUILDDIR)/glquake/gl_bumparb.o :      $(MOUNT_DIR)/gl_bumparb.c
 	$(DO_GL_CC)
 
+$(BUILDDIR)/glquake/gl_bumpgl2.o :      $(MOUNT_DIR)/gl_bumpgl2.c
+	$(DO_GL_CC)
+
 $(BUILDDIR)/glquake/gl_bumpmap.o :      $(MOUNT_DIR)/gl_bumpmap.c
 	$(DO_GL_CC)
 
diff --git a/sdl/Makefile.am b/sdl/Makefile.am
index c6161fc..c53c018 100644
--- a/sdl/Makefile.am
+++ b/sdl/Makefile.am
@@ -34,8 +34,8 @@ glx_tenebrae_AFLAGS = -x assembler-with-cpp
 sdl_tenebrae_AFLAGS = -x assembler-with-cpp
 
 # datadir is a variable defined by autoconf to @prefix@/share/ 
-glx_tenebrae_CFLAGS = @CFLAGS@ @X11_CFLAGS@  -D__glx__ -DGLQUAKE -DBASEDIR=@GAMEDIR@ -I$(MASTER_DIR) -I$(NVPARSE_DIR) 
-sdl_tenebrae_CFLAGS = @CFLAGS@ @SDL_CFLAGS@ -DSDL      -DGLQUAKE -DBASEDIR=@GAMEDIR@ -I$(MASTER_DIR) -I$(NVPARSE_DIR) 
+glx_tenebrae_CFLAGS = @CFLAGS@ @X11_CFLAGS@  -DUSE_ASM -D__glx__ -DGLQUAKE -DBASEDIR=@GAMEDIR@ -I$(MASTER_DIR) -I$(NVPARSE_DIR) 
+sdl_tenebrae_CFLAGS = @CFLAGS@ @SDL_CFLAGS@ -DUSE_ASM -DSDL      -DGLQUAKE -DBASEDIR=@GAMEDIR@ -I$(MASTER_DIR) -I$(NVPARSE_DIR) 
 
 
 libnvparse_a_SOURCES = 			\
@@ -287,6 +287,7 @@ GL_TENEBRAE_SRCS =			\
 	$(MASTER_DIR)/gl_brushinstant.c		\
 	$(MASTER_DIR)/gl_bumpdriver.c		\
 	$(MASTER_DIR)/gl_bumparb.c		\
+	$(MASTER_DIR)/gl_bumpgl2.c		\
 	$(MASTER_DIR)/gl_bumpgf.c		\
 	$(MASTER_DIR)/gl_bumpmap.c		\
 	$(MASTER_DIR)/gl_bumpparhelia.c		\