From eb40729806717aa26b6ef9d4ffb5eae689ac17ce Mon Sep 17 00:00:00 2001 From: sezero Date: Thu, 23 Aug 2018 14:00:02 +0300 Subject: [PATCH] glide3x: remove old makefiles, which are obsoleted for quite some time. the master branch still has the old makefiles I guess, so, look at the master branch if need reference. update sst1 makefiles to store the libs under individual sst1 and sst96 directories. update linux makefiles for XPATH variable usage. rename makefile.linux to Makefile.linux under the tests directories. --- glide3x/cvg/bin/makefile.linux | 23 ------ glide3x/cvg/binsrc/makefile.linux | 23 ------ glide3x/cvg/glide3/makefile.linux | 24 ------ .../tests/{makefile.linux => Makefile.linux} | 8 +- glide3x/cvg/glide3/tests/makefile.distrib | 15 ---- glide3x/cvg/include/makefile.linux | 23 ------ glide3x/cvg/incsrc/makefile.linux | 26 ------- glide3x/cvg/init/makefile.linux | 53 -------------- glide3x/cvg/lib/keep.me | 0 glide3x/cvg/lib/makefile.linux | 23 ------ glide3x/cvg/libsrc/makefile.linux | 23 ------ glide3x/cvg/makefile.linux | 31 -------- glide3x/h3/bin/makefile.linux | 23 ------ glide3x/h3/binsrc/makefile.linux | 24 ------ glide3x/h3/glide3/makefile.linux | 25 ------- .../tests/{makefile.linux => Makefile.linux} | 17 +++-- glide3x/h3/glide3/tests/makefile.distrib | 15 ---- glide3x/h3/include/makefile.linux | 24 ------ glide3x/h3/lib/keep.me | 0 glide3x/h3/lib/makefile.linux | 24 ------ glide3x/h3/libsrc/makefile.linux | 24 ------ glide3x/h3/makefile.linux | 31 -------- glide3x/h3/minihwc/makefile | 73 ------------------- glide3x/h3/minihwc/makefile.linux | 40 ---------- .../tests/{makefile.linux => Makefile.linux} | 17 +++-- glide3x/h5/lib/keep.me | 0 glide3x/h5/lib/makefile | 23 ------ glide3x/sst1/bin/makefile.linux | 23 ------ glide3x/sst1/binsrc/makefile.linux | 23 ------ glide3x/sst1/cmd/makefile.linux | 24 ------ glide3x/sst1/glide3/makefile.linux | 24 ------ glide3x/sst1/glide3/src/Makefile.DJ | 3 +- glide3x/sst1/glide3/src/Makefile.linux | 14 ++-- glide3x/sst1/glide3/src/Makefile.mingw | 3 +- glide3x/sst1/glide3/src/Makefile.wat | 3 +- glide3x/sst1/glide3/src/Makefile.win32 | 3 +- glide3x/sst1/glide3/tests/Makefile.DJ | 6 +- .../tests/{makefile.linux => Makefile.linux} | 27 ++++--- glide3x/sst1/glide3/tests/Makefile.wat | 6 +- glide3x/sst1/glide3/tests/Makefile.win32 | 6 +- glide3x/sst1/include/makefile.linux | 23 ------ glide3x/sst1/incsrc/makefile.linux | 25 ------- glide3x/sst1/incsrc/makefile.sun | 26 ------- glide3x/sst1/init/init96/makefile.linux | 53 -------------- glide3x/sst1/init/initvg/MAKEFILE.new | 50 ------------- glide3x/sst1/init/initvg/makefile.linux | 53 -------------- glide3x/sst1/init/makefile.linux | 51 ------------- glide3x/sst1/lib/makefile.linux | 23 ------ glide3x/sst1/lib/makefile.sun | 23 ------ glide3x/sst1/lib/sst1/keep.me | 0 glide3x/sst1/libsrc/makefile.linux | 23 ------ glide3x/sst1/makefile.linux | 24 ------ 52 files changed, 64 insertions(+), 1107 deletions(-) delete mode 100644 glide3x/cvg/bin/makefile.linux delete mode 100644 glide3x/cvg/binsrc/makefile.linux delete mode 100644 glide3x/cvg/glide3/makefile.linux rename glide3x/cvg/glide3/tests/{makefile.linux => Makefile.linux} (86%) delete mode 100644 glide3x/cvg/glide3/tests/makefile.distrib delete mode 100644 glide3x/cvg/include/makefile.linux delete mode 100644 glide3x/cvg/incsrc/makefile.linux delete mode 100644 glide3x/cvg/init/makefile.linux create mode 100644 glide3x/cvg/lib/keep.me delete mode 100644 glide3x/cvg/lib/makefile.linux delete mode 100644 glide3x/cvg/libsrc/makefile.linux delete mode 100644 glide3x/cvg/makefile.linux delete mode 100644 glide3x/h3/bin/makefile.linux delete mode 100644 glide3x/h3/binsrc/makefile.linux delete mode 100644 glide3x/h3/glide3/makefile.linux rename glide3x/h3/glide3/tests/{makefile.linux => Makefile.linux} (76%) delete mode 100644 glide3x/h3/glide3/tests/makefile.distrib delete mode 100644 glide3x/h3/include/makefile.linux create mode 100644 glide3x/h3/lib/keep.me delete mode 100644 glide3x/h3/lib/makefile.linux delete mode 100644 glide3x/h3/libsrc/makefile.linux delete mode 100644 glide3x/h3/makefile.linux delete mode 100644 glide3x/h3/minihwc/makefile delete mode 100644 glide3x/h3/minihwc/makefile.linux rename glide3x/h5/glide3/tests/{makefile.linux => Makefile.linux} (77%) create mode 100644 glide3x/h5/lib/keep.me delete mode 100644 glide3x/h5/lib/makefile delete mode 100644 glide3x/sst1/bin/makefile.linux delete mode 100644 glide3x/sst1/binsrc/makefile.linux delete mode 100644 glide3x/sst1/cmd/makefile.linux delete mode 100644 glide3x/sst1/glide3/makefile.linux rename glide3x/sst1/glide3/tests/{makefile.linux => Makefile.linux} (61%) delete mode 100644 glide3x/sst1/include/makefile.linux delete mode 100644 glide3x/sst1/incsrc/makefile.linux delete mode 100644 glide3x/sst1/incsrc/makefile.sun delete mode 100644 glide3x/sst1/init/init96/makefile.linux delete mode 100644 glide3x/sst1/init/initvg/MAKEFILE.new delete mode 100644 glide3x/sst1/init/initvg/makefile.linux delete mode 100644 glide3x/sst1/init/makefile.linux delete mode 100644 glide3x/sst1/lib/makefile.linux delete mode 100644 glide3x/sst1/lib/makefile.sun create mode 100644 glide3x/sst1/lib/sst1/keep.me delete mode 100644 glide3x/sst1/libsrc/makefile.linux delete mode 100644 glide3x/sst1/makefile.linux diff --git a/glide3x/cvg/bin/makefile.linux b/glide3x/cvg/bin/makefile.linux deleted file mode 100644 index 45b271f..0000000 --- a/glide3x/cvg/bin/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(patsubst CVS,,$(patsubst makefile%,,$(wildcard *))) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak diff --git a/glide3x/cvg/binsrc/makefile.linux b/glide3x/cvg/binsrc/makefile.linux deleted file mode 100644 index fc3a94a..0000000 --- a/glide3x/cvg/binsrc/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - diff --git a/glide3x/cvg/glide3/makefile.linux b/glide3x/cvg/glide3/makefile.linux deleted file mode 100644 index bd3ff7f..0000000 --- a/glide3x/cvg/glide3/makefile.linux +++ /dev/null @@ -1,24 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -THISDIR = glide3 -SUBDIRS = src tests - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak diff --git a/glide3x/cvg/glide3/tests/makefile.linux b/glide3x/cvg/glide3/tests/Makefile.linux similarity index 86% rename from glide3x/cvg/glide3/tests/makefile.linux rename to glide3x/cvg/glide3/tests/Makefile.linux index 222e370..514d037 100644 --- a/glide3x/cvg/glide3/tests/makefile.linux +++ b/glide3x/cvg/glide3/tests/Makefile.linux @@ -19,7 +19,7 @@ .PHONY: all .SUFFIXES: .c .o .exe -.SECONDARY: tlib.o +.SECONDARY: tlib.o linutil.o FX_GLIDE_HW = cvg TOP = ../../.. @@ -38,8 +38,12 @@ LDLIBS += -lm .c.o: $(CC) -o $@ $(CFLAGS) -c $< -%.exe: $(TOP)/swlibs/fxmisc/linutil.o tlib.o %.o +%.exe: linutil.o tlib.o %.o $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) all: $(error Must specify to build) + +linutil.o: $(TOP)/swlibs/fxmisc/linutil.c + $(CC) -o $@ $(CFLAGS) -c $< + diff --git a/glide3x/cvg/glide3/tests/makefile.distrib b/glide3x/cvg/glide3/tests/makefile.distrib deleted file mode 100644 index 1d14aec..0000000 --- a/glide3x/cvg/glide3/tests/makefile.distrib +++ /dev/null @@ -1,15 +0,0 @@ - -CFLAGS = -I. -I/usr/include/glide - -SRCS = $(wildcard test*.c) -OBJS = $(SRCS:.c=.o) -EXECS = $(basename $(SRCS)) -LIB_OBJS = tlib.o - -all: $(EXECS) - -clean: - rm $(EXECS) *.o - -$(EXECS): $(OBJS) $(LIB_OBJS) - $(CC) -o $@ $@.o $(LIB_OBJS) -lglide3 -lm diff --git a/glide3x/cvg/include/makefile.linux b/glide3x/cvg/include/makefile.linux deleted file mode 100644 index a672a49..0000000 --- a/glide3x/cvg/include/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(wildcard *.h) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak diff --git a/glide3x/cvg/incsrc/makefile.linux b/glide3x/cvg/incsrc/makefile.linux deleted file mode 100644 index 12d4dc8..0000000 --- a/glide3x/cvg/incsrc/makefile.linux +++ /dev/null @@ -1,26 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -HEADERS=$(wildcard *.h) - -INSTALL_DESTINATION=$(BUILD_ROOT)/cvg - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - diff --git a/glide3x/cvg/init/makefile.linux b/glide3x/cvg/init/makefile.linux deleted file mode 100644 index 6acb99b..0000000 --- a/glide3x/cvg/init/makefile.linux +++ /dev/null @@ -1,53 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -# local defines, options, includes -LCDEFS = -DINIT_LINUX -LCOPTS = -LCINCS = -I$(BUILD_ROOT)/cvg/include -I$(BUILD_ROOT_SWLIBS)/include - -# sources -HEADERS = sst1init.h -INSTALL_DESTINATION = $(BUILD_ROOT)/cvg -CFILES = sst1init.c info.c print.c parse.c gamma.c util.c \ - sli.c video.c dac.c gdebug.c canopus.c - -SUBLIBRARIES = $(BUILD_ROOT_SWLIBS)/lib/libfxpci.a - -ifeq ($(FX_DLL_BUILD_INIT),1) -FX_DLL_LIBRARY = 1 -endif - -# targets -LIBRARIES = libsst1init.a -RCFILE = init.rc - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - -init.res: rcver.h -sst1init.obj: rcver.h - -# -# This library must be compiled without the big optimization options -# for some strange reason -# -ifndef DEBUG -CFLAGS = -g $(GCFLAGS) $(LCFLAGS) $(VCFLAGS) -endif diff --git a/glide3x/cvg/lib/keep.me b/glide3x/cvg/lib/keep.me new file mode 100644 index 0000000..e69de29 diff --git a/glide3x/cvg/lib/makefile.linux b/glide3x/cvg/lib/makefile.linux deleted file mode 100644 index e72ea65..0000000 --- a/glide3x/cvg/lib/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(wildcard *.a *.so) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak diff --git a/glide3x/cvg/libsrc/makefile.linux b/glide3x/cvg/libsrc/makefile.linux deleted file mode 100644 index 515394a..0000000 --- a/glide3x/cvg/libsrc/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -INSTALL_DESTINATION=$(BUILD_ROOT_SST1) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak diff --git a/glide3x/cvg/makefile.linux b/glide3x/cvg/makefile.linux deleted file mode 100644 index 62ae31b..0000000 --- a/glide3x/cvg/makefile.linux +++ /dev/null @@ -1,31 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -THISDIR = cvg - -SUBDIRS = bin binsrc lib libsrc include incsrc init - -ifeq ($(FX_HW_PROJECTS),) -FX_HW_PROJECTS = glide3 -endif - -SUBDIRS += $(FX_HW_PROJECTS) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak diff --git a/glide3x/h3/bin/makefile.linux b/glide3x/h3/bin/makefile.linux deleted file mode 100644 index 45b271f..0000000 --- a/glide3x/h3/bin/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(patsubst CVS,,$(patsubst makefile%,,$(wildcard *))) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak diff --git a/glide3x/h3/binsrc/makefile.linux b/glide3x/h3/binsrc/makefile.linux deleted file mode 100644 index e2beea4..0000000 --- a/glide3x/h3/binsrc/makefile.linux +++ /dev/null @@ -1,24 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -INSTALL_DESTINATION=$(BUILD_ROOT)/h3 - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - diff --git a/glide3x/h3/glide3/makefile.linux b/glide3x/h3/glide3/makefile.linux deleted file mode 100644 index 9d540e2..0000000 --- a/glide3x/h3/glide3/makefile.linux +++ /dev/null @@ -1,25 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -THISDIR = glide -SUBDIRS = src tests - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - diff --git a/glide3x/h3/glide3/tests/makefile.linux b/glide3x/h3/glide3/tests/Makefile.linux similarity index 76% rename from glide3x/h3/glide3/tests/makefile.linux rename to glide3x/h3/glide3/tests/Makefile.linux index d7c1f7e..0598630 100644 --- a/glide3x/h3/glide3/tests/makefile.linux +++ b/glide3x/h3/glide3/tests/Makefile.linux @@ -11,8 +11,8 @@ # Environment variables: # DGA=1 Build DGA version (experimental). # default = no -# XPATH specify X libraries path; needed by DGA. -# default = /usr/X11R6/lib +# XPATH specify X1 path; needed by DGA. +# default = /usr/X11R6 # CPU optimize for the given processor. # default = pentium # @@ -22,12 +22,12 @@ .PHONY: all .SUFFIXES: .c .o .exe -.SECONDARY: tlib.o +.SECONDARY: tlib.o linutil.o FX_GLIDE_HW = h3 TOP = ../../.. CPU ?= pentium -XPATH ?= /usr/X11R6/lib +XPATH ?= /usr/X11R6 CC = gcc CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU) @@ -39,15 +39,18 @@ LDFLAGS = -s -L$(TOP)/$(FX_GLIDE_HW)/lib LDLIBS = -lglide3 ifeq ($(DGA),1) -LDFLAGS += -L$(XPATH) -LDLIBS += -lX11 -lXext -lXxf86dga +LDLIBS += -L$(XPATH)/lib -lX11 -lXext -lXxf86dga endif LDLIBS += -lm .c.o: $(CC) -o $@ $(CFLAGS) -c $< -%.exe: $(TOP)/swlibs/fxmisc/linutil.o tlib.o %.o +%.exe: linutil.o tlib.o %.o $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) all: $(error Must specify to build) + +linutil.o: $(TOP)/swlibs/fxmisc/linutil.c + $(CC) -o $@ $(CFLAGS) -c $< + diff --git a/glide3x/h3/glide3/tests/makefile.distrib b/glide3x/h3/glide3/tests/makefile.distrib deleted file mode 100644 index 2dbbdb9..0000000 --- a/glide3x/h3/glide3/tests/makefile.distrib +++ /dev/null @@ -1,15 +0,0 @@ - -CFLAGS = -I. -I/usr/include/glide3 - -SRCS = $(wildcard test*.c) -OBJS = $(SRCS:.c=.o) -EXECS = $(basename $(SRCS)) -LIB_OBJS = tlib.o - -all: $(EXECS) - -clean: - rm $(EXECS) *.o - -$(EXECS): $(OBJS) $(LIB_OBJS) - $(CC) -o $@ $@.o $(LIB_OBJS) -lglide3 -lm diff --git a/glide3x/h3/include/makefile.linux b/glide3x/h3/include/makefile.linux deleted file mode 100644 index d8d1645..0000000 --- a/glide3x/h3/include/makefile.linux +++ /dev/null @@ -1,24 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(wildcard *.h) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - diff --git a/glide3x/h3/lib/keep.me b/glide3x/h3/lib/keep.me new file mode 100644 index 0000000..e69de29 diff --git a/glide3x/h3/lib/makefile.linux b/glide3x/h3/lib/makefile.linux deleted file mode 100644 index 998bc48..0000000 --- a/glide3x/h3/lib/makefile.linux +++ /dev/null @@ -1,24 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(wildcard lib*) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - diff --git a/glide3x/h3/libsrc/makefile.linux b/glide3x/h3/libsrc/makefile.linux deleted file mode 100644 index e2beea4..0000000 --- a/glide3x/h3/libsrc/makefile.linux +++ /dev/null @@ -1,24 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -INSTALL_DESTINATION=$(BUILD_ROOT)/h3 - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - diff --git a/glide3x/h3/makefile.linux b/glide3x/h3/makefile.linux deleted file mode 100644 index ed4062a..0000000 --- a/glide3x/h3/makefile.linux +++ /dev/null @@ -1,31 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -THISDIR = h3 - -SUBDIRS = bin binsrc lib libsrc include incsrc minihwc - -ifeq ($(FX_HW_PROJECTS),) -FX_HW_PROJECTS = glide3 -endif - -SUBDIRS += $(FX_HW_PROJECTS) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak diff --git a/glide3x/h3/minihwc/makefile b/glide3x/h3/minihwc/makefile deleted file mode 100644 index d9f2472..0000000 --- a/glide3x/h3/minihwc/makefile +++ /dev/null @@ -1,73 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -!if "$(DEBUG)" == "1" -VCDEFS = $(VCDEFS) -DGDBG_INFO_ON -!endif - -!if "$(FX_TARGET)" == "DOS" -#Target Dos -PCILIB = $(BUILD_ROOT)\swlibs\lib\fxpci.lib -CINITLIB = $(BUILD_ROOT)\h3\lib\h3cinit.lib -VMODE = dos_mode.c - - -!else -#Target Windows -DXINCS = -I$(DIRECTXSDK)\include -DXDEFS = -DHWC_ACCESS_DDRAW -DXLIBS = $(DIRECTXSDK)\lib\dxguid.lib \ - $(DIRECTXSDK)\lib\ddraw.lib -CINITLIB = -VMODE = win_mode.c -!if "$(HWC_INIT_VXD)" == "1" -PCILIB = $(BUILD_ROOT)\swlibs\lib\fxpci.lib -CINITLIB = $(BUILD_ROOT)\h3\lib\h3cinit.lib -!else -LCDEFS = -DHWC_EXT_INIT -PRIVATE_HEADERS = $(PRIVATE_HEADERS) hwcext.h -!endif -!endif - -!if "$(FX_COMPILER)" == "MICROSOFT" -LCOPTS = /WX -!endif - -LDIRT = -LCINCS = $(LCINCS) \ - $(DXINCS) \ - -I$(DXDDK)\inc \ - -I$(W9XDDK)\inc32 \ - -I$(BUILD_ROOT_SWLIBS)\include \ - -I$(BUILD_ROOT)\h3\include -LCDEFS = $(LCDEFS) $(DXDEFS) -HEADERS = $(PRIVATE_HEADERS) minihwc.h setmode.h hwcio.h - -CFILES = minihwc.c hwcio.c gdebug.c $(VMODE) - -SUBLIBRARIES = $(PCILIB) $(DXLIBS) $(CINITLIB) - -LIBRARIES= minihwc.lib - -INSTALL_DESTINATION = $(BUILD_ROOT)\$(FX_GLIDE_HW) - - -!include $(BUILD_ROOT_SWLIBS)/include/nmake/3dfx.mak - diff --git a/glide3x/h3/minihwc/makefile.linux b/glide3x/h3/minihwc/makefile.linux deleted file mode 100644 index 6f0ac9e..0000000 --- a/glide3x/h3/minihwc/makefile.linux +++ /dev/null @@ -1,40 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -ifeq ($(DEBUG),1) -VCDEFS += -DGDBG_INFO_ON -endif - -LDIRT = -LCINCS += -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT)/h3/include -HEADERS = minihwc.h setmode.h hwcio.h lindri.h - -OSDEPC = linhwc.c - -CFILES = $(OSDEPC) hwcio.c gdebug.c - -LIBRARIES= libminihwc.a -SUBLIBRARIES = $(PCILIB) - -INSTALL_DESTINATION = $(BUILD_ROOT)/$(FX_GLIDE_HW) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.linux.mak - - diff --git a/glide3x/h5/glide3/tests/makefile.linux b/glide3x/h5/glide3/tests/Makefile.linux similarity index 77% rename from glide3x/h5/glide3/tests/makefile.linux rename to glide3x/h5/glide3/tests/Makefile.linux index d057700..d931d84 100644 --- a/glide3x/h5/glide3/tests/makefile.linux +++ b/glide3x/h5/glide3/tests/Makefile.linux @@ -11,8 +11,8 @@ # Environment variables: # DGA=1 Build DGA version (experimental). # default = no -# XPATH specify X libraries path; needed by DGA. -# default = /usr/X11R6/lib +# XPATH specify X11 path; needed by DGA. +# default = /usr/X11R6 # CPU optimize for the given processor. # default = pentium # @@ -22,12 +22,12 @@ .PHONY: all .SUFFIXES: .c .o .exe -.SECONDARY: tlib.o +.SECONDARY: tlib.o linutil.o FX_GLIDE_HW = h5 TOP = ../../.. CPU ?= pentium -XPATH ?= /usr/X11R6/lib +XPATH ?= /usr/X11R6 CC = gcc CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU) @@ -40,15 +40,18 @@ LDFLAGS = -s -L$(TOP)/$(FX_GLIDE_HW)/lib LDLIBS = -lglide3 ifeq ($(DGA),1) -LDFLAGS += -L$(XPATH) -LDLIBS += -lX11 -lXext -lXxf86dga +LDLIBS += -L$(XPATH)/lib -lX11 -lXext -lXxf86dga endif LDLIBS += -lm .c.o: $(CC) -o $@ $(CFLAGS) -c $< -%.exe: $(TOP)/swlibs/fxmisc/linutil.o tlib.o %.o +%.exe: linutil.o tlib.o %.o $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) all: $(error Must specify to build) + +linutil.o: $(TOP)/swlibs/fxmisc/linutil.c + $(CC) -o $@ $(CFLAGS) -c $< + diff --git a/glide3x/h5/lib/keep.me b/glide3x/h5/lib/keep.me new file mode 100644 index 0000000..e69de29 diff --git a/glide3x/h5/lib/makefile b/glide3x/h5/lib/makefile deleted file mode 100644 index 1a93cb0..0000000 --- a/glide3x/h5/lib/makefile +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = *.lib - -!include $(BUILD_ROOT_SWLIBS)\include\nmake\3dfx.mak diff --git a/glide3x/sst1/bin/makefile.linux b/glide3x/sst1/bin/makefile.linux deleted file mode 100644 index 2d410b3..0000000 --- a/glide3x/sst1/bin/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(patsubst CVS,,$(patsubst makefile%,,$(wildcard *))) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/binsrc/makefile.linux b/glide3x/sst1/binsrc/makefile.linux deleted file mode 100644 index 477fab2..0000000 --- a/glide3x/sst1/binsrc/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak - diff --git a/glide3x/sst1/cmd/makefile.linux b/glide3x/sst1/cmd/makefile.linux deleted file mode 100644 index c369020..0000000 --- a/glide3x/sst1/cmd/makefile.linux +++ /dev/null @@ -1,24 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -THISDIR = cmd -SUBDIRS = pass - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/glide3/makefile.linux b/glide3x/sst1/glide3/makefile.linux deleted file mode 100644 index a00e768..0000000 --- a/glide3x/sst1/glide3/makefile.linux +++ /dev/null @@ -1,24 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -THISDIR = glide -SUBDIRS = src tests - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/glide3/src/Makefile.DJ b/glide3x/sst1/glide3/src/Makefile.DJ index 0045b1b..c082d00 100644 --- a/glide3x/sst1/glide3/src/Makefile.DJ +++ b/glide3x/sst1/glide3/src/Makefile.DJ @@ -41,7 +41,7 @@ TEXUS_EXE = texus2.exe FX_GLIDE_HW ?= sst1 FX_GLIDE_SW = ../../../swlibs -GLIDE_LIBDIR = ../../lib +GLIDE_LIBDIR = ../../lib/$(FX_GLIDE_HW) TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin ############################################################################### @@ -79,7 +79,6 @@ CDEFS += -DSST96_FIFO #CDEFS += -DINIT96VGASWAP CDEFS += -DINIT_ACCESS_DIRECT CDEFS += -DGLIDE_USE_ALT_REGMAP -GLIDE_LIBDIR = ../../lib/sst96 else $(error Invalid FX_GLIDE_HW setting) endif diff --git a/glide3x/sst1/glide3/src/Makefile.linux b/glide3x/sst1/glide3/src/Makefile.linux index eaccab7..f7d7099 100644 --- a/glide3x/sst1/glide3/src/Makefile.linux +++ b/glide3x/sst1/glide3/src/Makefile.linux @@ -11,8 +11,8 @@ # Environment variables: # FX_GLIDE_HW build for the given ASIC (either sst1, or sst96). # default = sst1 -# XPATH specify X libraries path; needed for sst96. -# default = /usr/X11R6/lib (sst96 only) +# XPATH specify X11 path; needed for sst96. +# default = /usr/X11R6 (sst96 only) # OPTFLAGS pass given optimization flags to compiler # default = -O1 -ffast-math # DEBUG=1 enable debugging checks and messages @@ -52,7 +52,7 @@ GLIDE_SHARED = $(GLIDE_SONAME).$(GLIDE_VERSION_MINOR) FX_GLIDE_HW ?= sst1 FX_GLIDE_SW = ../../../swlibs -GLIDE_LIBDIR = ../../lib +GLIDE_LIBDIR = ../../lib/$(FX_GLIDE_HW) TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin ############################################################################### @@ -71,9 +71,9 @@ CP = cp # platform CDEFS = -DINIT_LINUX -XPATH ?= /usr/X11R6/lib +XPATH ?= /usr/X11R6 ifeq ($(FX_GLIDE_HW),sst96) -LDFLAGS = -L$(XPATH) +LDFLAGS = -L$(XPATH)/lib ## FIXME: no -lXxf86rush in new X versions LDLIBS = -lX11 -lXxf86dga -lXxf86rush -lXxf86vm endif @@ -91,7 +91,6 @@ CDEFS += -DSST96 CDEFS += -DSST96_FIFO #CDEFS += -DSST96_ALT_FIFO_WRAP CDEFS += -DGLIDE_USE_ALT_REGMAP -GLIDE_LIBDIR = ../../lib/sst96 else $(error Invalid FX_GLIDE_HW setting) endif @@ -125,6 +124,9 @@ CFLAGS = -Wall 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 +ifeq ($(FX_GLIDE_HW),sst96) +CFLAGS += -I$(XPATH)/include +endif CFLAGS += $(CDEFS) ifeq ($(USE_X86),1) diff --git a/glide3x/sst1/glide3/src/Makefile.mingw b/glide3x/sst1/glide3/src/Makefile.mingw index 32cc2df..7bcd69a 100644 --- a/glide3x/sst1/glide3/src/Makefile.mingw +++ b/glide3x/sst1/glide3/src/Makefile.mingw @@ -44,7 +44,7 @@ TEXUS_EXE = texus2.exe FX_GLIDE_HW ?= sst1 FX_GLIDE_SW = ../../../swlibs -GLIDE_LIBDIR = ../../lib +GLIDE_LIBDIR = ../../lib/$(FX_GLIDE_HW) TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin ############################################################################### @@ -86,7 +86,6 @@ CDEFS += -DSST96_FIFO #CDEFS += -DINIT96VGASWAP #CDEFS += -DINIT_ACCESS_DIRECT CDEFS += -DGLIDE_USE_ALT_REGMAP -GLIDE_LIBDIR = ../../lib/sst96 else $(error Invalid FX_GLIDE_HW setting) endif diff --git a/glide3x/sst1/glide3/src/Makefile.wat b/glide3x/sst1/glide3/src/Makefile.wat index 24d1752..51f1b0c 100644 --- a/glide3x/sst1/glide3/src/Makefile.wat +++ b/glide3x/sst1/glide3/src/Makefile.wat @@ -41,7 +41,7 @@ TEXUS_EXE = texus2.exe FX_GLIDE_HW ?= sst1 FX_GLIDE_SW = ../../../swlibs -GLIDE_LIBDIR = ../../lib +GLIDE_LIBDIR = ../../lib/$(FX_GLIDE_HW) TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin ############################################################################### @@ -79,7 +79,6 @@ CDEFS += -DSST96_FIFO #CDEFS += -DINIT96VGASWAP CDEFS += -DINIT_ACCESS_DIRECT CDEFS += -DGLIDE_USE_ALT_REGMAP -GLIDE_LIBDIR = ../../lib/sst96 else $(error Invalid FX_GLIDE_HW setting) endif diff --git a/glide3x/sst1/glide3/src/Makefile.win32 b/glide3x/sst1/glide3/src/Makefile.win32 index 8bb49e2..895ce24 100644 --- a/glide3x/sst1/glide3/src/Makefile.win32 +++ b/glide3x/sst1/glide3/src/Makefile.win32 @@ -43,7 +43,7 @@ TEXUS_EXE = texus2.exe FX_GLIDE_HW ?= sst1 FX_GLIDE_SW = ..\..\..\swlibs -GLIDE_LIBDIR = ..\..\lib +GLIDE_LIBDIR = ..\..\lib\$(FX_GLIDE_HW) TEXUS_EXEDIR = $(FX_GLIDE_SW)\bin ############################################################################### @@ -82,7 +82,6 @@ CDEFS += -DSST96_FIFO #CDEFS += -DINIT96VGASWAP #CDEFS += -DINIT_ACCESS_DIRECT CDEFS += -DGLIDE_USE_ALT_REGMAP -GLIDE_LIBDIR = ..\..\lib\sst96 else $(error Invalid FX_GLIDE_HW setting) endif diff --git a/glide3x/sst1/glide3/tests/Makefile.DJ b/glide3x/sst1/glide3/tests/Makefile.DJ index 2823765..3561058 100644 --- a/glide3x/sst1/glide3/tests/Makefile.DJ +++ b/glide3x/sst1/glide3/tests/Makefile.DJ @@ -34,7 +34,7 @@ HWDEF = -DSST96 endif endif -override FX_GLIDE_HW = sst1 +override FX_HW_BASE = sst1 TOP = ../../.. CPU ?= pentium @@ -42,12 +42,12 @@ UNLINK = rm -f $(1) CC = gcc CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU) -CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init +CFLAGS += -I$(TOP)/$(FX_HW_BASE)/glide3/src -I$(TOP)/$(FX_HW_BASE)/incsrc -I$(TOP)/$(FX_HW_BASE)/init CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -D__DOS__ $(HWDEF) CFLAGS += -D__DOS32__ -LDFLAGS = -s -L$(TOP)/$(FX_GLIDE_HW)/lib +LDFLAGS = -s -L$(TOP)/$(FX_HW_BASE)/lib/$(FX_GLIDE_HW) ifdef DXE LDLIBS = -lglide3i diff --git a/glide3x/sst1/glide3/tests/makefile.linux b/glide3x/sst1/glide3/tests/Makefile.linux similarity index 61% rename from glide3x/sst1/glide3/tests/makefile.linux rename to glide3x/sst1/glide3/tests/Makefile.linux index f49ff6a..86a5928 100644 --- a/glide3x/sst1/glide3/tests/makefile.linux +++ b/glide3x/sst1/glide3/tests/Makefile.linux @@ -13,6 +13,8 @@ # default = sst1 # CPU optimize for the given processor. # default = pentium +# XPATH specify X11 path; needed for sst96. +# default = /usr/X11R6 (sst96 only) # # Targets: # build a specific file @@ -21,38 +23,43 @@ .PHONY: all .SUFFIXES: .c .o .exe -.SECONDARY: tlib.o +.SECONDARY: tlib.o linutil.o FX_GLIDE_HW ?= sst1 +XPATH ?= /usr/X11R6 ifeq ($(FX_GLIDE_HW),sst1) HWDEF = -DSST1 -else +endif ifeq ($(FX_GLIDE_HW),sst96) HWDEF = -DSST96 -XPATH = -L/usr/X11R6/lib -XLIBS = -lXxf86dga -lXxf86rush -lXxf86vm -endif endif -override FX_GLIDE_HW = sst1 +override FX_HW_BASE = sst1 TOP = ../../.. CPU ?= pentium CC = gcc CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU) -CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init +CFLAGS += -I$(TOP)/$(FX_HW_BASE)/glide3/src -I$(TOP)/$(FX_HW_BASE)/incsrc -I$(TOP)/$(FX_HW_BASE)/init CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += $(HWDEF) -LDFLAGS = -s -L$(TOP)/$(FX_GLIDE_HW)/lib $(XPATH) +LDFLAGS = -s -L$(TOP)/$(FX_HW_BASE)/lib/$(FX_GLIDE_HW) LDLIBS = -lglide3x -LDLIBS += $(XLIBS) -lm +ifeq ($(FX_GLIDE_HW),sst96) +LDLIBS += -L$(XPATH)/lib -lXxf86dga -lXxf86rush -lXxf86vm +endif +LDLIBS += -lm .c.o: $(CC) -o $@ $(CFLAGS) -c $< -%.exe: $(TOP)/swlibs/fxmisc/linutil.o tlib.o %.o +%.exe: linutil.o tlib.o %.o $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) all: $(error Must specify to build) + +linutil.o: $(TOP)/swlibs/fxmisc/linutil.c + $(CC) -o $@ $(CFLAGS) -c $< + diff --git a/glide3x/sst1/glide3/tests/Makefile.wat b/glide3x/sst1/glide3/tests/Makefile.wat index 5c947fd..e24611e 100644 --- a/glide3x/sst1/glide3/tests/Makefile.wat +++ b/glide3x/sst1/glide3/tests/Makefile.wat @@ -35,12 +35,12 @@ HWDEF = -DSST96 endif endif -override FX_GLIDE_HW = sst1 +override FX_HW_BASE = sst1 TOP = ../../.. CC = wcl386 CFLAGS = -wx -CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init +CFLAGS += -I$(TOP)/$(FX_HW_BASE)/glide3/src -I$(TOP)/$(FX_HW_BASE)/incsrc -I$(TOP)/$(FX_HW_BASE)/init CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -D__DOS__ $(HWDEF) CFLAGS += -D__DOS32__ @@ -54,7 +54,7 @@ endif LDFLAGS = -k16384 -LDLIBS = $(TOP)/$(FX_GLIDE_HW)/lib/glide3x.lib +LDLIBS = $(TOP)/$(FX_HW_BASE)/lib/$(FX_GLIDE_HW)/glide3x.lib # Watcom woes: pass parameters through environment vars export WCC386 = $(subst /,\,$(CFLAGS)) diff --git a/glide3x/sst1/glide3/tests/Makefile.win32 b/glide3x/sst1/glide3/tests/Makefile.win32 index 4e4415e..d5dc0aa 100644 --- a/glide3x/sst1/glide3/tests/Makefile.win32 +++ b/glide3x/sst1/glide3/tests/Makefile.win32 @@ -33,19 +33,19 @@ HWDEF = -DSST96 endif endif -override FX_GLIDE_HW = sst1 +override FX_HW_BASE = sst1 TOP = ../../.. CPU ?= 6 CC = cl CFLAGS = -nologo -W3 -WX -D__MSC__=1 -DNDEBUG -G$(CPU) -O2 -MT -CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init +CFLAGS += -I$(TOP)/$(FX_HW_BASE)/glide3/src -I$(TOP)/$(FX_HW_BASE)/incsrc -I$(TOP)/$(FX_HW_BASE)/init CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -D__WIN32__ $(HWDEF) LD = link LDFLAGS = -nologo -opt:WIN98 -machine:IX86 -LDLIBS = user32.lib gdi32.lib $(TOP)/$(FX_GLIDE_HW)/lib/glide3x.lib +LDLIBS = user32.lib gdi32.lib $(TOP)/$(FX_HW_BASE)/lib/$(FX_GLIDE_HW)/glide3x.lib .c.obj: $(CC) -Fo$@ $(CFLAGS) -c $< diff --git a/glide3x/sst1/include/makefile.linux b/glide3x/sst1/include/makefile.linux deleted file mode 100644 index 1d9a8b0..0000000 --- a/glide3x/sst1/include/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(wildcard *.h) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/incsrc/makefile.linux b/glide3x/sst1/incsrc/makefile.linux deleted file mode 100644 index 731472a..0000000 --- a/glide3x/sst1/incsrc/makefile.linux +++ /dev/null @@ -1,25 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -HEADERS = $(wildcard *.h) - -INSTALL_DESTINATION = $(BUILD_ROOT_HW) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/incsrc/makefile.sun b/glide3x/sst1/incsrc/makefile.sun deleted file mode 100644 index d42c3fd..0000000 --- a/glide3x/sst1/incsrc/makefile.sun +++ /dev/null @@ -1,26 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -HEADERS=*.h - -INSTALL_DESTINATION=$(BUILD_ROOT_SST1) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak - diff --git a/glide3x/sst1/init/init96/makefile.linux b/glide3x/sst1/init/init96/makefile.linux deleted file mode 100644 index 98c76e1..0000000 --- a/glide3x/sst1/init/init96/makefile.linux +++ /dev/null @@ -1,53 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -# local defines, options, includes - -LCDEFS = -DSST96 -ifeq ($(FX_SST96_ALT_FIFO),1) -LCDEFS += -DSST96_ALT_FIFO_WRAP -endif - -PARTNERCFILES = initmcrx.c -#init8625.c - -ifeq ($(DEBUG),1) -DBGOPTS = -DGDBG_INFO_ON -endif - -ifneq ($(FX_GLIDE_HW),sst96) -LCDEFS += -DDUMMY -endif - -LCOPTS += $(DBGOPTS) \ - -I$(BUILD_ROOT_SWLIBS)/include \ - -I$(BUILD_ROOT_HW)/include - -# sources -HEADERS = init96.h initvga.h -PRIVATE_HEADERS = atvga.h fxinit96.h initat3d.h initmcrx.h -INSTALL_DESTINATION = $(BUILD_ROOT_HW) -CFILES = $(PARTNERCFILES) init96.c lindrvr.c - -# targets -LIBRARIES = libinit96.a - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak - diff --git a/glide3x/sst1/init/initvg/MAKEFILE.new b/glide3x/sst1/init/initvg/MAKEFILE.new deleted file mode 100644 index 6daecae..0000000 --- a/glide3x/sst1/init/initvg/MAKEFILE.new +++ /dev/null @@ -1,50 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -# local defines, options, includes -LCDEFS = -DGDBG_INFO_ON -DINIT_DOS -LCOPTS = -WX -LCINCS = -I$(BUILD_ROOT_SWLIBS)\include -I$(BUILD_ROOT_SST1)\include - -!if "$(FX_SST96_PAGE_FIFO)" != "1" -LCDEFS = $(LCDEFS) -DSST96_ALT_FIFO_WRAP -!endif - -# sources -HEADERS = sst1init.h gdebug.h -INSTALL_DESTINATION = $(BUILD_ROOT_SST1) -CFILES = sst1init.c info.c print.c parse.c gamma.c util.c \ - sli.c video.c dac.c gdebug.c - -!if "$(FX_DLL_BUILDSST1INIT)" == "1" -SUBLIBRARIES = $(BUILD_ROOT_SWLIBS)\lib\fxpci.lib -FX_DLL_LIBRARY = 1 -!else -SUBLIBRARIES = -!endif - -# targets -LIBRARIES = sst1init.lib -RCFILE = init.rc - -!include $(BUILD_ROOT_SWLIBS)/include/nmake/3dfx.mak - -init.res: rcver.h -sst1init.obj: rcver.h diff --git a/glide3x/sst1/init/initvg/makefile.linux b/glide3x/sst1/init/initvg/makefile.linux deleted file mode 100644 index 705a508..0000000 --- a/glide3x/sst1/init/initvg/makefile.linux +++ /dev/null @@ -1,53 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -# local defines, options, includes -LCDEFS = -DGDBG_INFO_ON -DINIT_LINUX -LCOPTS = -LCINC = -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include - -ifeq ($(FX_SST96_PAGE_FIFO),1) -LCDEFS += -DSST96_ALT_FIFO_WRAP -endif - -# sources -HEADERS = sst1init.h gdebug.h -INSTALL_DESTINATION = $(BUILD_ROOT_HW) -CFILES = sst1init.c info.c print.c parse.c gamma.c util.c \ - sli.c video.c dac.c gdebug.c - -ifeq ($(FX_DLL_BUILDSST1INIT),1) -SUBLIBRARIES = $(BUILD_ROOT_SWLIBS)/lib/libfxpci.a -else -SUBLIBRARIES = -endif - -# targets -LIBRARIES = libsst1.a - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak - -# -# This library must be compiled without the big optimization options -# for some strange reason -# -ifndef DEBUG -CFLAGS = -O -m486 -fomit-frame-pointer $(LCDEFS) $(LCOPTS) $(LCINC) -endif diff --git a/glide3x/sst1/init/makefile.linux b/glide3x/sst1/init/makefile.linux deleted file mode 100644 index f9c44ee..0000000 --- a/glide3x/sst1/init/makefile.linux +++ /dev/null @@ -1,51 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -THISDIR=init -SUBDIRS=initvg init96 - -# local defines, options, includes -ifdef DEBUG -LCDEFS = -DGDBG_INFO_ON -endif -LCOPTS = -LCINCS = -I$(BUILD_ROOT_HW)/include - -ifeq ($(FX_GLIDE_HW),sst96) -INITHW = SST96 -else -INITHW = SST1 -endif - -# Turn on the alternate fifo handling code -ifeq ($(FX_SST96_PAGE_FIFO),1) -LCDEFS += -DSST96_ALT_FIFO_WRAP -endif - -LCDEFS += -D$(INITHW) - -HEADERS = init.h sst1vid.h -PRIVATE_HEADERS = fxinit.h -INSTALL_DESTINATION = $(BUILD_ROOT_HW) -CFILES = init.c vgdrvr.c vg96drvr.c - -LIBRARIES = libinit.a - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/lib/makefile.linux b/glide3x/sst1/lib/makefile.linux deleted file mode 100644 index 8b0ca14..0000000 --- a/glide3x/sst1/lib/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = $(wildcard *.a *.so) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/lib/makefile.sun b/glide3x/sst1/lib/makefile.sun deleted file mode 100644 index b8dcbc8..0000000 --- a/glide3x/sst1/lib/makefile.sun +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -LDIRT = *.a - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/lib/sst1/keep.me b/glide3x/sst1/lib/sst1/keep.me new file mode 100644 index 0000000..e69de29 diff --git a/glide3x/sst1/libsrc/makefile.linux b/glide3x/sst1/libsrc/makefile.linux deleted file mode 100644 index 9a31576..0000000 --- a/glide3x/sst1/libsrc/makefile.linux +++ /dev/null @@ -1,23 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -INSTALL_DESTINATION=$(BUILD_ROOT_HW) - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak diff --git a/glide3x/sst1/makefile.linux b/glide3x/sst1/makefile.linux deleted file mode 100644 index 10eb27a..0000000 --- a/glide3x/sst1/makefile.linux +++ /dev/null @@ -1,24 +0,0 @@ -# -# THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -# PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -# TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -# INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -# DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -# THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -# FULL TEXT OF THE NON-WARRANTY PROVISIONS. -# -# USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -# RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -# TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -# AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -# SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -# THE UNITED STATES. -# -# COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -# - -THISDIR = sst1 -SUBDIRS = incsrc libsrc binsrc include bin lib init glide cmd - -include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak