From 91e7543a18ac24bef2e7d3698922568ff11ad70e Mon Sep 17 00:00:00 2001
From: dborca <>
Date: Fri, 7 May 2004 06:06:12 +0000
Subject: [PATCH] updated makefiles for NASM (no more phase error)

---
 glide3x/Makefile.win32                 | 2 +-
 glide3x/README                         | 2 +-
 glide3x/cvg/glide3/src/Makefile.DJ     | 3 +--
 glide3x/cvg/glide3/src/makefile.linux  | 3 +--
 glide3x/h3/glide3/src/Makefile.DJ      | 3 +--
 glide3x/h3/glide3/src/makefile.linux   | 3 +--
 glide3x/h5/glide3/src/Makefile.DJ      | 3 +--
 glide3x/h5/glide3/src/makefile.linux   | 3 +--
 glide3x/sst1/glide3/src/Makefile.DJ    | 3 +--
 glide3x/sst1/glide3/src/makefile.linux | 3 +--
 10 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/glide3x/Makefile.win32 b/glide3x/Makefile.win32
index 9465bea..5eea875 100644
--- a/glide3x/Makefile.win32
+++ b/glide3x/Makefile.win32
@@ -307,7 +307,7 @@ AS   = nasmw
 CFLAGS  = -G6 -W3 -WX -c -D__MSC__=1 -D_X86_=1 -DNULL=0 -D_WIN32=1 -DWIN32=1 -D__WIN32__=1 -DSTRICT
 LFLAGS  = -nologo /DLL /OPT:WIN98 /MACHINE:IX86 /NODEFAULTLIB
 ARFLAGS = -nologo
-ASFLAGS = -O2 -fwin32 -D__WIN32__ --prefix _
+ASFLAGS = -O6 -fwin32 -D__WIN32__ --prefix _
 
 !if "$(DEBUG)"== "1"
 CFLAGS  = $(CFLAGS) -Od -MDd -DDEBUG=1 -D_DEBUG -D_MT -D_DLL -Zi
diff --git a/glide3x/README b/glide3x/README
index ba9f91e..3591392 100644
--- a/glide3x/README
+++ b/glide3x/README
@@ -7,7 +7,7 @@ cvg:	HW:		Voodoo^2
 h3:	HW:		Voodoo Banshee, Voodoo3
 	OS:		DOS(DJGPP), Linux(DRI)
 	Maintainers:	Daniel Borca, Guillem Jover
-h3:	HW:		Voodoo Banshee, Velocity 100/200, Voodoo3/4/5
+h5:	HW:		Voodoo Banshee, Velocity 100/200, Voodoo3/4/5
 	OS:		DOS(DJGPP), Linux(DRI), Win32
 	Maintainers:	Hiroshi Morii, Daniel Borca, Guillem Jover
 
diff --git a/glide3x/cvg/glide3/src/Makefile.DJ b/glide3x/cvg/glide3/src/Makefile.DJ
index 19a9143..7546ecc 100644
--- a/glide3x/cvg/glide3/src/Makefile.DJ
+++ b/glide3x/cvg/glide3/src/Makefile.DJ
@@ -104,8 +104,7 @@ endif
 ARFLAGS = rus
 
 # assembler
-ASFLAGS = -O2 -fcoff -D__DJGPP__ --prefix _
-ASFLAGS += -I.
+ASFLAGS = -O6 -fcoff -D__DJGPP__ --prefix _
 ASFLAGS += $(CDEFS)
 
 # compiler
diff --git a/glide3x/cvg/glide3/src/makefile.linux b/glide3x/cvg/glide3/src/makefile.linux
index 52bb6d9..8537f6d 100644
--- a/glide3x/cvg/glide3/src/makefile.linux
+++ b/glide3x/cvg/glide3/src/makefile.linux
@@ -100,8 +100,7 @@ endif
 ARFLAGS = rus
 
 # assembler
-ASFLAGS = -O2 -felf -D__linux__
-ASFLAGS += -I.
+ASFLAGS = -O6 -felf -D__linux__
 ASFLAGS += $(CDEFS)
 
 # compiler
diff --git a/glide3x/h3/glide3/src/Makefile.DJ b/glide3x/h3/glide3/src/Makefile.DJ
index 411edcc..dd3c7eb 100644
--- a/glide3x/h3/glide3/src/Makefile.DJ
+++ b/glide3x/h3/glide3/src/Makefile.DJ
@@ -108,8 +108,7 @@ endif
 ARFLAGS = rus
 
 # assembler
-ASFLAGS = -O2 -fcoff -D__DJGPP__ --prefix _
-ASFLAGS += -I.
+ASFLAGS = -O6 -fcoff -D__DJGPP__ --prefix _
 ASFLAGS += $(CDEFS)
 
 # compiler
diff --git a/glide3x/h3/glide3/src/makefile.linux b/glide3x/h3/glide3/src/makefile.linux
index 64acb61..17a0729 100644
--- a/glide3x/h3/glide3/src/makefile.linux
+++ b/glide3x/h3/glide3/src/makefile.linux
@@ -121,8 +121,7 @@ endif
 ARFLAGS = rus
 
 # assembler
-ASFLAGS = -O2 -felf -D__linux__
-ASFLAGS += -I.
+ASFLAGS = -O6 -felf -D__linux__
 ASFLAGS += $(CDEFS)
 
 # compiler
diff --git a/glide3x/h5/glide3/src/Makefile.DJ b/glide3x/h5/glide3/src/Makefile.DJ
index 3cca922..71d9234 100644
--- a/glide3x/h5/glide3/src/Makefile.DJ
+++ b/glide3x/h5/glide3/src/Makefile.DJ
@@ -115,8 +115,7 @@ endif
 ARFLAGS = rus
 
 # assembler
-ASFLAGS = -O2 -fcoff -D__DJGPP__ --prefix _
-ASFLAGS += -I.
+ASFLAGS = -O6 -fcoff -D__DJGPP__ --prefix _
 ASFLAGS += $(CDEFS)
 
 # compiler
diff --git a/glide3x/h5/glide3/src/makefile.linux b/glide3x/h5/glide3/src/makefile.linux
index 4270895..e26bb55 100644
--- a/glide3x/h5/glide3/src/makefile.linux
+++ b/glide3x/h5/glide3/src/makefile.linux
@@ -128,8 +128,7 @@ endif
 ARFLAGS = rus
 
 # assembler
-ASFLAGS = -O2 -felf -D__linux__
-ASFLAGS += -I.
+ASFLAGS = -O6 -felf -D__linux__
 ASFLAGS += $(CDEFS)
 
 # compiler
diff --git a/glide3x/sst1/glide3/src/Makefile.DJ b/glide3x/sst1/glide3/src/Makefile.DJ
index 6392b96..260613a 100644
--- a/glide3x/sst1/glide3/src/Makefile.DJ
+++ b/glide3x/sst1/glide3/src/Makefile.DJ
@@ -108,8 +108,7 @@ endif
 ARFLAGS = rus
 
 # assembler
-ASFLAGS = -O2 -fcoff -D__DJGPP__ --prefix _
-ASFLAGS += -I.
+ASFLAGS = -O6 -fcoff -D__DJGPP__ --prefix _
 ASFLAGS += $(CDEFS)
 
 # compiler
diff --git a/glide3x/sst1/glide3/src/makefile.linux b/glide3x/sst1/glide3/src/makefile.linux
index 25a54f4..0c49bfc 100644
--- a/glide3x/sst1/glide3/src/makefile.linux
+++ b/glide3x/sst1/glide3/src/makefile.linux
@@ -103,8 +103,7 @@ endif
 ARFLAGS = rus
 
 # assembler
-ASFLAGS = -O2 -felf -D__linux__
-ASFLAGS += -I.
+ASFLAGS = -O6 -felf -D__linux__
 ASFLAGS += $(CDEFS)
 
 # compiler