From 16f66e6d2836e13e82ee3265f8cf1eefc9d99648 Mon Sep 17 00:00:00 2001
From: sezero <sezero@users.sourceforge.net>
Date: Sun, 19 Aug 2018 16:09:13 +0300
Subject: [PATCH] glide2x, cvg/h3: minor mikefile.linux updates

---
 glide2x/cvg/glide/src/makefile.linux | 5 +----
 glide2x/h3/glide/src/makefile.linux  | 8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/glide2x/cvg/glide/src/makefile.linux b/glide2x/cvg/glide/src/makefile.linux
index 98b0fe2..9d741db 100644
--- a/glide2x/cvg/glide/src/makefile.linux
+++ b/glide2x/cvg/glide/src/makefile.linux
@@ -16,8 +16,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (cvg).
-#			default = cvg
 #	CPU		optimize for the given processor.
 #			default = 6 (PentiumPro)
 #	DEBUG=1		disable optimizations and build for debug.
@@ -58,7 +56,6 @@ GLIDE_SO  = libglide.so
 GLIDE_SONAME = $(GLIDE_SO).$(GLIDE_VERSION_MAJOR)
 GLIDE_SHARED = $(GLIDE_SONAME).$(GLIDE_VERSION_MINOR)
 
-FX_GLIDE_HW ?= cvg
 FX_GLIDE_SW = ../../../swlibs
 GLIDE_LIBDIR = ../../lib
 
@@ -87,7 +84,7 @@ CDEFS += -DGLIDE_HW_TRI_SETUP=1 -DGLIDE_PACKED_RGB=1 -DGLIDE_TRI_CULLING=1 -DGLI
 # special sli buffer clears
 CDEFS += -DGLIDE_BLIT_CLEAR=1
 
-# workaround for CVGs with broken tsus which cannot send commands to multiple 
+# workaround for CVGs with broken tsus which cannot send commands to multiple
 # tmus using chipfield. chipfield will always be set to 0xf
 CDEFS += -DGLIDE_CHIP_BROADCAST=1
 
diff --git a/glide2x/h3/glide/src/makefile.linux b/glide2x/h3/glide/src/makefile.linux
index 2b863eb..d6a3d13 100644
--- a/glide2x/h3/glide/src/makefile.linux
+++ b/glide2x/h3/glide/src/makefile.linux
@@ -12,8 +12,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (h3).
-#			default = h3
 #	XPATH		specify X libraries path; needed by DRI.
 #			default = /usr/X11R6/lib
 #	H4=1		High speed Avenger.
@@ -54,7 +52,6 @@ GLIDE_SO  = libglide.so
 GLIDE_SONAME = $(GLIDE_SO).$(GLIDE_VERSION_MAJOR)
 GLIDE_SHARED = $(GLIDE_SONAME).$(GLIDE_VERSION_MINOR)
 
-FX_GLIDE_HW ?= h3
 FX_GLIDE_SW = ../../../swlibs
 GLIDE_LIBDIR = ../../lib
 
@@ -82,8 +79,7 @@ LDLIBS += -lm
 
 # general
 CDEFS += -DGLIDE_HW_TRI_SETUP=1 -DGLIDE_INIT_HWC -DGLIDE_PACKED_RGB=0 -DGLIDE_TRI_CULLING=1
-CDEFS += -DENDB -DGLIDE_LIB -DFX_STATIC_BUILD -DHAL_HW=1
-#CDEFS += -DGLIDE_CHECK_CONTEXT
+CDEFS += -DGLIDE_LIB -DHAL_HW=1
 
 # subsystem
 CDEFS += -DH3
@@ -100,7 +96,7 @@ override USE_FIFO = 1
 #override USE_X86 = 1
 
 ifeq ($(USE_X86),1)
-CDEFS += -DGLIDE_DISPATCH_SETUP=1 -DGLIDE_DISPATCH_DOWNLOAD=1
+CDEFS += -DGLIDE_DISPATCH_SETUP=1
 override USE_FIFO = 1
 CDEFS += -DHAVE_XDRAWTRI_ASM=1
 override USE_DRAWTRI_ASM = 1