From 32f0f47956e8f8f8eab5554281c0638d8a5b090d Mon Sep 17 00:00:00 2001
From: dborca <>
Date: Fri, 8 Oct 2004 06:20:23 +0000
Subject: [PATCH] makefile cleanup

---
 glide3x/cvg/glide3/src/makefile.linux  | 6 +++---
 glide3x/h3/glide3/src/Makefile.win32   | 9 +++------
 glide3x/sst1/glide3/src/Makefile.wat   | 2 +-
 glide3x/sst1/glide3/src/Makefile.win32 | 2 +-
 glide3x/sst1/glide3/src/makefile.linux | 6 +++---
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/glide3x/cvg/glide3/src/makefile.linux b/glide3x/cvg/glide3/src/makefile.linux
index 354188d..c564c8a 100644
--- a/glide3x/cvg/glide3/src/makefile.linux
+++ b/glide3x/cvg/glide3/src/makefile.linux
@@ -46,8 +46,8 @@ export PATH := $(PATH):.
 #	general defines (user settable?)
 ###############################################################################
 
-GLIDE_LIB = libglide3.a
-GLIDE_SO  = libglide3.so
+GLIDE_LIB = libglide3x.a
+GLIDE_SO  = libglide3x.so
 TEXUS_EXE = texus2
 
 FX_GLIDE_HW ?= cvg
@@ -244,7 +244,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_OBJECTS:.o=.lo)
 
 $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB)
 ifeq ($(TEXUS2),1)
-	$(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lglide3 -lm
+	$(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lglide3x -lm
 else
 	$(warning Texus2 not enabled... Skipping $(TEXUS_EXE))
 endif
diff --git a/glide3x/h3/glide3/src/Makefile.win32 b/glide3x/h3/glide3/src/Makefile.win32
index 7d8e2b5..1e1af1d 100644
--- a/glide3x/h3/glide3/src/Makefile.win32
+++ b/glide3x/h3/glide3/src/Makefile.win32
@@ -15,11 +15,13 @@
 #    Environment variables:
 #	FX_GLIDE_HW	build for the given ASIC (h3).
 #			default = h3
+#	H4=1		High speed Avenger.
+#			default = no
 #	CPU		optimize for the given processor.
 #			default = 6 (PentiumPro)
 #	DEBUG=1		disable optimizations and build for debug.
 #			default = no
-#	USE_X86=1	use assembler triangle specializations; req by CVG
+#	USE_X86=1	use assembler triangle specializations!
 #			default = no
 #	USE_3DNOW=1	allow 3DNow! specializations. However, the true CPU
 #			capabilities are still checked at run-time to avoid
@@ -129,8 +131,6 @@ CFLAGS += -I$(FX_GLIDE_SW)/fxmisc -I$(FX_GLIDE_SW)/newpci/pcilib -I$(FX_GLIDE_SW
 CFLAGS += -I$(FX_GLIDE_SW)/texus2/lib
 CFLAGS += $(CDEFS)
 
-override USE_X86 = 1
-
 ifeq ($(USE_3DNOW),1)
 CFLAGS += -DGL_AMD3D
 override USE_X86 = 1
@@ -257,8 +257,6 @@ xdraw2_def.obj: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) $<
 xdraw3_def.obj: xdraw3.asm
 	$(AS) -o $@ $(ASFLAGS) $<
-xtexdl_def.obj: xtexdl_def.c
-	$(CC) -Fo$@ $(CFLAGS) -c $<
 xdraw2_3dnow.obj: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
 xdraw3_3dnow.obj: xdraw3.asm
@@ -284,7 +282,6 @@ fxgasm.exe: fxgasm.c
 clean:
 	-$(call UNLINK,*.obj)
 	-$(call UNLINK,../../minihwc/*.obj)
-	-$(call UNLINK,$(FX_GLIDE_SW)/newpci/pcilib/*.obj)
 	-$(call UNLINK,fxinline.h)
 	-$(call UNLINK,fxgasm.h)
 	-$(call UNLINK,$(FX_GLIDE_SW)/texus2/lib/*.obj)
diff --git a/glide3x/sst1/glide3/src/Makefile.wat b/glide3x/sst1/glide3/src/Makefile.wat
index 5a7dfbd..92ec3b7 100644
--- a/glide3x/sst1/glide3/src/Makefile.wat
+++ b/glide3x/sst1/glide3/src/Makefile.wat
@@ -13,7 +13,7 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (cvg).
+#	FX_GLIDE_HW	build for the given ASIC (sst1, sst96).
 #			default = sst1
 #	CPU		optimize for the given processor.
 #			default = 5s (Pentium, stack)
diff --git a/glide3x/sst1/glide3/src/Makefile.win32 b/glide3x/sst1/glide3/src/Makefile.win32
index 1962961..3848c9c 100644
--- a/glide3x/sst1/glide3/src/Makefile.win32
+++ b/glide3x/sst1/glide3/src/Makefile.win32
@@ -13,7 +13,7 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (cvg).
+#	FX_GLIDE_HW	build for the given ASIC (sst1, sst96).
 #			default = sst1
 #	CPU		optimize for the given processor.
 #			default = 6 (PentiumPro)
diff --git a/glide3x/sst1/glide3/src/makefile.linux b/glide3x/sst1/glide3/src/makefile.linux
index 634917d..31dd320 100644
--- a/glide3x/sst1/glide3/src/makefile.linux
+++ b/glide3x/sst1/glide3/src/makefile.linux
@@ -42,8 +42,8 @@ export PATH := $(PATH):.
 #	general defines (user settable?)
 ###############################################################################
 
-GLIDE_LIB = libglide3.a
-GLIDE_SO  = libglide3.so
+GLIDE_LIB = libglide3x.a
+GLIDE_SO  = libglide3x.so
 TEXUS_EXE = texus2
 
 FX_GLIDE_HW ?= sst1
@@ -245,7 +245,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_OBJECTS:.o=.lo)
 
 $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB)
 ifeq ($(TEXUS2),1)
-	$(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lglide3 -lm
+	$(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lglide3x -lm
 else
 	$(warning Texus2 not enabled... Skipping $(TEXUS_EXE))
 endif