From 8080e4a845b22cfab382794d597f3a2eb270259f Mon Sep 17 00:00:00 2001 From: sezero Date: Sat, 18 Aug 2018 12:58:36 +0300 Subject: [PATCH] glide2x, cvg, sst1: further makefile updates --- glide2x/cvg/glide/src/Makefile.win32 | 62 +++------------------- glide2x/cvg/glide/src/makefile.linux | 3 -- glide2x/sst1/glide/src/Makefile.win32 | 74 +++------------------------ glide2x/sst1/glide/src/makefile.linux | 2 +- 4 files changed, 14 insertions(+), 127 deletions(-) diff --git a/glide2x/cvg/glide/src/Makefile.win32 b/glide2x/cvg/glide/src/Makefile.win32 index a53a12a..8436341 100644 --- a/glide2x/cvg/glide/src/Makefile.win32 +++ b/glide2x/cvg/glide/src/Makefile.win32 @@ -1,4 +1,4 @@ -# Win32 makefile for Glide2/CVG and Texus2 +# Win32 makefile for Glide2/CVG # This makefile MUST be processed by GNU make!!! # # Copyright (c) 2004 @@ -12,7 +12,6 @@ # Web : http://www.3dfxzone.it/koolsmoky # - # # Available options: # @@ -29,12 +28,10 @@ # capabilities are still checked at run-time to avoid # crashes. # default = no -# USE_MMX=1 allow MMX specializations. -# default = no -# TEXUS2=1 embed Texus2 functions into Glide2. +# USE_MMX=1 allow MMX specializations. +# default = no +# FXOEM2X=1 build fxoem2x.dll # default = no -# FXOEM2X=1 build fxoem2x.dll -# default = no # # Targets: # all: build everything @@ -43,8 +40,6 @@ # realclean: remove all generated files # - - .PHONY: all glide2x clean realclean .INTERMEDIATE: fxgasm.exe .SUFFIXES: .c .obj .rc .res @@ -56,12 +51,10 @@ GLIDE_RES = glide.res GLIDE_DLL = glide2x.dll GLIDE_IMP = glide2x.lib -TEXUS_EXE = texus2.exe FX_GLIDE_HW ?= cvg FX_GLIDE_SW = ../../../swlibs GLIDE_LIBDIR = ../../lib -TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin ############################################################################### # tools @@ -122,10 +115,6 @@ endif # other CDEFS += -DGLIDE_PLUG -DGLIDE_SPLASH -ifeq ($(TEXUS2),1) -CDEFS += -DHAVE_TEXUS2 -endif - ############################################################################### # flags ############################################################################### @@ -153,7 +142,6 @@ endif CFLAGS += -I. -I../../incsrc -I../../init CFLAGS += -I$(FX_GLIDE_SW)/fxmisc -I$(FX_GLIDE_SW)/newpci/pcilib -I$(FX_GLIDE_SW)/fxmemmap -CFLAGS += -I$(FX_GLIDE_SW)/texus2/lib CFLAGS += $(CDEFS) # cpu optimized triangle @@ -209,7 +197,7 @@ endif ifeq ($(USE_3DNOW),1) GLIDE_OBJECTS += \ xdraw2_3dnow.obj \ - xtexdl_3dnow.obj + xtexdl_3dnow.obj endif else GLIDE_OBJECTS += \ @@ -235,35 +223,6 @@ GLIDE_OBJECTS += \ ../../init/video.obj \ ../../init/fxremap.obj -TEXUS_SOURCES = \ - $(FX_GLIDE_SW)/texus2/lib/texuslib.c \ - $(FX_GLIDE_SW)/texus2/lib/clamp.c \ - $(FX_GLIDE_SW)/texus2/lib/read.c \ - $(FX_GLIDE_SW)/texus2/lib/resample.c \ - $(FX_GLIDE_SW)/texus2/lib/mipmap.c \ - $(FX_GLIDE_SW)/texus2/lib/quantize.c \ - $(FX_GLIDE_SW)/texus2/lib/ncc.c \ - $(FX_GLIDE_SW)/texus2/lib/nccnnet.c \ - $(FX_GLIDE_SW)/texus2/lib/pal256.c \ - $(FX_GLIDE_SW)/texus2/lib/pal6666.c \ - $(FX_GLIDE_SW)/texus2/lib/dequant.c \ - $(FX_GLIDE_SW)/texus2/lib/view.c \ - $(FX_GLIDE_SW)/texus2/lib/util.c \ - $(FX_GLIDE_SW)/texus2/lib/diffuse.c \ - $(FX_GLIDE_SW)/texus2/lib/write.c \ - $(FX_GLIDE_SW)/texus2/lib/tga.c \ - $(FX_GLIDE_SW)/texus2/lib/3df.c \ - $(FX_GLIDE_SW)/texus2/lib/ppm.c \ - $(FX_GLIDE_SW)/texus2/lib/rgt.c \ - $(FX_GLIDE_SW)/texus2/lib/txs.c \ - $(FX_GLIDE_SW)/texus2/lib/codec.c \ - $(FX_GLIDE_SW)/texus2/lib/eigen.c \ - $(FX_GLIDE_SW)/texus2/lib/bitcoder.c - -ifeq ($(TEXUS2),1) -GLIDE_OBJECTS += $(TEXUS_SOURCES:.c=.obj) -endif - ############################################################################### # rules ############################################################################### @@ -276,20 +235,13 @@ endif ############################################################################### # main ############################################################################### -all: glide2x $(TEXUS_EXEDIR)/$(TEXUS_EXE) fxoem2x +all: glide2x fxoem2x glide2x: $(GLIDE_LIBDIR)/$(GLIDE_DLL) $(GLIDE_LIBDIR)/$(GLIDE_DLL): $(GLIDE_OBJECTS) $(GLIDE_RES) $(LD) -out:$@ $(LDFLAGS) $(GLIDE_OBJECTS) $(LDLIBS) $(GLIDE_RES) -$(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_IMP) -#ifeq ($(TEXUS2),1) -# $(CC) -o $@ $(CFLAGS) $^ -#else -# $(warning Texus2 not enabled... Skipping $(TEXUS_EXE)) -#endif - fxoem2x: $(GLIDE_LIBDIR)/fxoem2x.dll ifeq ($(FXOEM2X),1) @@ -338,7 +290,6 @@ clean: -$(call UNLINK,$(FX_GLIDE_SW)/newpci/pcilib/*.obj) -$(call UNLINK,fxinline.h) -$(call UNLINK,fxgasm.h) - -$(call UNLINK,$(FX_GLIDE_SW)/texus2/lib/*.obj) -$(call UNLINK,../oem/oeminit.obj) -$(call UNLINK,../oem/oeminit.res) @@ -346,7 +297,6 @@ realclean: clean -$(call UNLINK,$(GLIDE_LIBDIR)/glide2x.exp) -$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_DLL)) -$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_IMP)) - -$(call UNLINK,$(TEXUS_EXEDIR)/$(TEXUS_EXE)) -$(call UNLINK,$(GLIDE_LIBDIR)/fxoem2x.exp) -$(call UNLINK,$(GLIDE_LIBDIR)/fxoem2x.dll) -$(call UNLINK,$(GLIDE_LIBDIR)/fxoem2x.lib) diff --git a/glide2x/cvg/glide/src/makefile.linux b/glide2x/cvg/glide/src/makefile.linux index 8f388c9..c46567a 100644 --- a/glide2x/cvg/glide/src/makefile.linux +++ b/glide2x/cvg/glide/src/makefile.linux @@ -12,7 +12,6 @@ # Copyright (c) 2006 - Guillem Jover # - # # Available options: # @@ -41,8 +40,6 @@ # realclean: remove all generated files # - - .PHONY: all glide2x clean realclean .INTERMEDIATE: fxgasm .SUFFIXES: .lo diff --git a/glide2x/sst1/glide/src/Makefile.win32 b/glide2x/sst1/glide/src/Makefile.win32 index 19702c6..881dcf1 100644 --- a/glide2x/sst1/glide/src/Makefile.win32 +++ b/glide2x/sst1/glide/src/Makefile.win32 @@ -1,4 +1,4 @@ -# Win32 makefile for Glide2/SST1 and Texus2 +# Win32 makefile for Glide2/SST1 # This makefile MUST be processed by GNU make!!! # # Copyright (c) 2004 @@ -12,7 +12,6 @@ # Web : http://www.3dfxzone.it/koolsmoky # - # # Available options: # @@ -25,10 +24,6 @@ # default = no # USE_X86=1 use assembler triangle specializations! # default = no -# TEXUS2=1 embed Texus2 functions into Glide3. -# default = no -# FXOEM2X=1 build fxoem2x.dll -# default = no # # Targets: # all: build everything @@ -37,8 +32,6 @@ # realclean: remove all generated files # - - .PHONY: all glide2x clean realclean .INTERMEDIATE: fxgasm.exe .SUFFIXES: .c .obj .rc .res @@ -50,12 +43,10 @@ GLIDE_RES = glide.res GLIDE_DLL = glide2x.dll GLIDE_IMP = glide2x.lib -TEXUS_EXE = texus2.exe FX_GLIDE_HW ?= sst1 FX_GLIDE_SW = ../../../swlibs GLIDE_LIBDIR = ../../lib -TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin ############################################################################### # tools @@ -93,6 +84,8 @@ CDEFS += -DSST96_FIFO #CDEFS += -DINIT96VGASWAP #CDEFS += -DINIT_ACCESS_DIRECT CDEFS += -DGLIDE_USE_ALT_REGMAP +else +$(error Invalid FX_GLIDE_HW setting) endif endif @@ -104,10 +97,6 @@ endif # other CDEFS += -DGLIDE_PLUG -DGLIDE_SPLASH -ifeq ($(TEXUS2),1) -CDEFS += -DHAVE_TEXUS2 -endif - ############################################################################### # flags ############################################################################### @@ -138,7 +127,6 @@ endif CFLAGS += -I. -I../../incsrc -I../../init -I../../init/initvg -I../../init/init96 CFLAGS += -I$(FX_GLIDE_SW)/fxmisc -I$(FX_GLIDE_SW)/newpci/pcilib -I$(FX_GLIDE_SW)/fxmemmap -CFLAGS += -I$(FX_GLIDE_SW)/texus2/lib CFLAGS += $(CDEFS) ifneq ($(USE_X86),1) @@ -172,6 +160,9 @@ GLIDE_OBJECTS = \ gtex.obj \ gtexdl.obj \ gutex.obj \ + gxdraw.obj + +GLIDE_OBJECTS += \ cpuid.obj ifeq ($(USE_X86),1) @@ -182,9 +173,6 @@ else GLIDE_OBJECTS += \ xdraw96.obj endif -else -GLIDE_OBJECTS += \ - gxdraw.obj endif ifeq ($(FX_GLIDE_HW),sst96) @@ -217,35 +205,6 @@ GLIDE_OBJECTS += \ $(FX_GLIDE_SW)/newpci/pcilib/fxvxd.obj \ $(FX_GLIDE_SW)/newpci/pcilib/fxnt.obj \ -TEXUS_SOURCES = \ - $(FX_GLIDE_SW)/texus2/lib/texuslib.c \ - $(FX_GLIDE_SW)/texus2/lib/clamp.c \ - $(FX_GLIDE_SW)/texus2/lib/read.c \ - $(FX_GLIDE_SW)/texus2/lib/resample.c \ - $(FX_GLIDE_SW)/texus2/lib/mipmap.c \ - $(FX_GLIDE_SW)/texus2/lib/quantize.c \ - $(FX_GLIDE_SW)/texus2/lib/ncc.c \ - $(FX_GLIDE_SW)/texus2/lib/nccnnet.c \ - $(FX_GLIDE_SW)/texus2/lib/pal256.c \ - $(FX_GLIDE_SW)/texus2/lib/pal6666.c \ - $(FX_GLIDE_SW)/texus2/lib/dequant.c \ - $(FX_GLIDE_SW)/texus2/lib/view.c \ - $(FX_GLIDE_SW)/texus2/lib/util.c \ - $(FX_GLIDE_SW)/texus2/lib/diffuse.c \ - $(FX_GLIDE_SW)/texus2/lib/write.c \ - $(FX_GLIDE_SW)/texus2/lib/tga.c \ - $(FX_GLIDE_SW)/texus2/lib/3df.c \ - $(FX_GLIDE_SW)/texus2/lib/ppm.c \ - $(FX_GLIDE_SW)/texus2/lib/rgt.c \ - $(FX_GLIDE_SW)/texus2/lib/txs.c \ - $(FX_GLIDE_SW)/texus2/lib/codec.c \ - $(FX_GLIDE_SW)/texus2/lib/eigen.c \ - $(FX_GLIDE_SW)/texus2/lib/bitcoder.c - -ifeq ($(TEXUS2),1) -GLIDE_OBJECTS += $(TEXUS_SOURCES:.c=.obj) -endif - ############################################################################### # rules ############################################################################### @@ -258,30 +217,13 @@ endif ############################################################################### # main ############################################################################### -all: glide2x $(TEXUS_EXEDIR)/$(TEXUS_EXE) +all: glide2x glide2x: $(GLIDE_LIBDIR)/$(GLIDE_DLL) $(GLIDE_LIBDIR)/$(GLIDE_DLL): $(GLIDE_OBJECTS) $(GLIDE_RES) $(LD) -out:$@ $(LDFLAGS) $(GLIDE_OBJECTS) $(LDLIBS) $(GLIDE_RES) -$(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_IMP) -#ifeq ($(TEXUS2),1) -# $(CC) -o $@ $(CFLAGS) $^ -#else -# $(warning Texus2 not enabled... Skipping $(TEXUS_EXE)) -#endif - -fxoem2x: $(GLIDE_LIBDIR)/fxoem2x.dll - -ifeq ($(FXOEM2X),1) -$(GLIDE_LIBDIR)/fxoem2x.dll: ../oem/oeminit.obj ../oem/oeminit.res -# $(LD) -out:$@ $(LDFLAGS) ../oem/oeminit.obj $(LDLIBS) ../oem/oeminit.res -else -$(GLIDE_LIBDIR)/fxoem2x.dll: -# $(warning FxOem2x not enabled... Skipping fxoem2x.dll) -endif - ############################################################################### # rules(2) ############################################################################### @@ -339,11 +281,9 @@ clean: -$(call UNLINK,$(FX_GLIDE_SW)/newpci/pcilib/*.obj) -$(call UNLINK,fxinline.h) -$(call UNLINK,fxgasm.h) - -$(call UNLINK,$(FX_GLIDE_SW)/texus2/lib/*.obj) -$(call UNLINK,$(GLIDE_RES)) realclean: clean -$(call UNLINK,$(GLIDE_LIBDIR)/glide2x.exp) -$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_DLL)) -$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_IMP)) - -$(call UNLINK,$(TEXUS_EXEDIR)/$(TEXUS_EXE)) diff --git a/glide2x/sst1/glide/src/makefile.linux b/glide2x/sst1/glide/src/makefile.linux index 93fbe1d..0444f18 100644 --- a/glide2x/sst1/glide/src/makefile.linux +++ b/glide2x/sst1/glide/src/makefile.linux @@ -29,7 +29,7 @@ # realclean: remove all generated files # -.PHONY: all glide3x clean realclean +.PHONY: all glide2x clean realclean .INTERMEDIATE: fxgasm .SUFFIXES: .lo