chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

glide3x, Makefile.win32: reverted most parts of commit 8c917cb2

Browse Source
This commit is contained in:
sezero
2018-08-25 21:20:30 +03:00
parent 72028096b9
commit 5db23883e9
5 changed files with 1298 additions and 1298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glide3x/Makefile.win32
View File

@@ -55,9 +55,9 @@ export BUILD_NUMBER = 40404
export FX_GLIDE_HW ?= h5
ifeq ($(FX_GLIDE_HW),sst96)
G3_DIR = sst1\glide3\src
G3_DIR = sst1/glide3/src
else
G3_DIR = $(FX_GLIDE_HW)\glide3\src
G3_DIR = $(FX_GLIDE_HW)/glide3/src
endif
all:

120
glide3x/cvg/glide3/src/Makefile.win32
View File

@@ -47,9 +47,9 @@ GLIDE_DLL = glide3x.dll
GLIDE_IMP = glide3x.lib
TEXUS_EXE = texus2.exe
FX_GLIDE_SW = ..\..\..\swlibs
GLIDE_LIBDIR = ..\..\lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)\bin
FX_GLIDE_SW = ../../../swlibs
GLIDE_LIBDIR = ../../lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
###############################################################################
# tools
@@ -60,8 +60,8 @@ AS = nasm
LD = link
RC = rc
ifeq ($(wildcard $(addsuffix \rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst \,\,$(1))
ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst /,\,$(1))
else
UNLINK = $(RM) $(1)
endif
@@ -126,9 +126,9 @@ OPTFLAGS ?= -G6 -O2
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 += -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) $(OPTFLAGS)
ifeq ($(USE_MMX),1)
@@ -197,48 +197,48 @@ endif
GLIDE_OBJECTS += \
digutex.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxpci.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxw32.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxvxd.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxnt.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxmsr.obj \
..\..\init\canopus.obj \
..\..\init\dac.obj \
..\..\init\gamma.obj \
..\..\init\gdebug.obj \
..\..\init\info.obj \
..\..\init\parse.obj \
..\..\init\print.obj \
..\..\init\sli.obj \
..\..\init\sst1init.obj \
..\..\init\util.obj \
..\..\init\video.obj \
..\..\init\fxremap.obj
$(FX_GLIDE_SW)/newpci/pcilib/fxpci.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxw32.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxvxd.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxnt.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxmsr.obj \
../../init/canopus.obj \
../../init/dac.obj \
../../init/gamma.obj \
../../init/gdebug.obj \
../../init/info.obj \
../../init/parse.obj \
../../init/print.obj \
../../init/sli.obj \
../../init/sst1init.obj \
../../init/util.obj \
../../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
$(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)
@@ -251,19 +251,19 @@ endif
.c.obj:
$(CC) -Fo$@ $(CFLAGS) -c $<
.rc.res:
$(RC) -Fo$@ $(CDEFS) -I$(FX_GLIDE_SW)\fxmisc $<
$(RC) -Fo$@ $(CDEFS) -I$(FX_GLIDE_SW)/fxmisc $<
###############################################################################
# main
###############################################################################
all: glide3x $(TEXUS_EXEDIR)\$(TEXUS_EXE)
all: glide3x $(TEXUS_EXEDIR)/$(TEXUS_EXE)
glide3x: $(GLIDE_LIBDIR)\$(GLIDE_DLL)
glide3x: $(GLIDE_LIBDIR)/$(GLIDE_DLL)
$(GLIDE_LIBDIR)\$(GLIDE_DLL): $(GLIDE_OBJECTS) $(GLIDE_RES)
$(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)
$(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_IMP)
#ifeq ($(TEXUS2),1)
# $(CC) -o $@ $(CFLAGS) $^
#else
@@ -308,15 +308,15 @@ fxgasm.exe: fxgasm.c
clean:
-$(call UNLINK,*.obj)
-$(call UNLINK,..\..\init\*.obj)
-$(call UNLINK,$(FX_GLIDE_SW)\newpci\pcilib\*.obj)
-$(call UNLINK,../../init/*.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)
-$(call UNLINK,$(FX_GLIDE_SW)/texus2/lib/*.obj)
-$(call UNLINK,$(GLIDE_RES))
realclean: clean
-$(call UNLINK,$(GLIDE_LIBDIR)\glide3x.exp)
-$(call UNLINK,$(GLIDE_LIBDIR)\$(GLIDE_DLL))
-$(call UNLINK,$(GLIDE_LIBDIR)\$(GLIDE_IMP))
-$(call UNLINK,$(TEXUS_EXEDIR)\$(TEXUS_EXE))
-$(call UNLINK,$(GLIDE_LIBDIR)/glide3x.exp)
-$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_DLL))
-$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_IMP))
-$(call UNLINK,$(TEXUS_EXEDIR)/$(TEXUS_EXE))

100
glide3x/h3/glide3/src/Makefile.win32
View File

@@ -45,9 +45,9 @@ GLIDE_DLL = glide3x.dll
GLIDE_IMP = glide3x.lib
TEXUS_EXE = texus2.exe
FX_GLIDE_SW = ..\..\..\swlibs
GLIDE_LIBDIR = ..\..\lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)\bin
FX_GLIDE_SW = ../../../swlibs
GLIDE_LIBDIR = ../../lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
###############################################################################
# tools
@@ -58,8 +58,8 @@ AS = nasm
LD = link
RC = rc
ifeq ($(wildcard $(addsuffix \rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst \,\,$(1))
ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst /,\,$(1))
else
UNLINK = $(RM) $(1)
endif
@@ -119,9 +119,9 @@ LDLIBS += LIBCMT.lib
OPTFLAGS ?= -G6 -O2
endif
CFLAGS += -I. -I..\..\incsrc -I..\..\minihwc
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 += -I. -I../../incsrc -I../../minihwc
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) $(OPTFLAGS)
ifeq ($(USE_3DNOW),1)
@@ -182,38 +182,38 @@ endif
GLIDE_OBJECTS += \
gthread.obj \
..\..\minihwc\hwcio.obj \
..\..\minihwc\gdebug.obj \
..\..\minihwc\minihwc.obj \
..\..\minihwc\win_mode.obj
../../minihwc/hwcio.obj \
../../minihwc/gdebug.obj \
../../minihwc/minihwc.obj \
../../minihwc/win_mode.obj
# so that we don't need win9x ddk:
GLIDE_OBJECTS += \
..\..\minihwc\win9x.obj
../../minihwc/win9x.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
$(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)
@@ -226,19 +226,19 @@ endif
.c.obj:
$(CC) -Fo$@ $(CFLAGS) -c $<
.rc.res:
$(RC) -Fo$@ $(CDEFS) -I$(FX_GLIDE_SW)\fxmisc $<
$(RC) -Fo$@ $(CDEFS) -I$(FX_GLIDE_SW)/fxmisc $<
###############################################################################
# main
###############################################################################
all: glide3x $(TEXUS_EXEDIR)\$(TEXUS_EXE)
all: glide3x $(TEXUS_EXEDIR)/$(TEXUS_EXE)
glide3x: $(GLIDE_LIBDIR)\$(GLIDE_DLL)
glide3x: $(GLIDE_LIBDIR)/$(GLIDE_DLL)
$(GLIDE_LIBDIR)\$(GLIDE_DLL): $(GLIDE_OBJECTS) $(GLIDE_RES)
$(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)
$(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_IMP)
#ifeq ($(TEXUS2),1)
# $(CC) -o $@ $(CFLAGS) $^
#else
@@ -262,16 +262,16 @@ xdraw3_3dnow.obj: xdraw3.asm
xtexdl_3dnow.obj: xtexdl.asm
$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
..\..\minihwc\win9x.obj: ..\..\minihwc\win9x.asm
../../minihwc/win9x.obj: ../../minihwc/win9x.asm
$(AS) -o $@ -O2 -fwin32 $<
$(GLIDE_OBJECTS): fxinline.h fxgasm.h
fxinline.h: fxgasm.exe
$< -inline > $@
.\$< -inline > $@
fxgasm.h: fxgasm.exe
$< -hex > $@
.\$< -hex > $@
fxgasm.exe: fxgasm.c
$(CC) -o $@ $(CFLAGS) $<
@@ -282,14 +282,14 @@ fxgasm.exe: fxgasm.c
clean:
-$(call UNLINK,*.obj)
-$(call UNLINK,..\..\minihwc\*.obj)
-$(call UNLINK,../../minihwc/*.obj)
-$(call UNLINK,fxinline.h)
-$(call UNLINK,fxgasm.h)
-$(call UNLINK,$(FX_GLIDE_SW)\texus2\lib\*.obj)
-$(call UNLINK,$(FX_GLIDE_SW)/texus2/lib/*.obj)
-$(call UNLINK,$(GLIDE_RES))
realclean: clean
-$(call UNLINK,$(GLIDE_LIBDIR)\glide3x.exp)
-$(call UNLINK,$(GLIDE_LIBDIR)\$(GLIDE_DLL))
-$(call UNLINK,$(GLIDE_LIBDIR)\$(GLIDE_IMP))
-$(call UNLINK,$(TEXUS_EXEDIR)\$(TEXUS_EXE))
-$(call UNLINK,$(GLIDE_LIBDIR)/glide3x.exp)
-$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_DLL))
-$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_IMP))
-$(call UNLINK,$(TEXUS_EXEDIR)/$(TEXUS_EXE))

104
glide3x/h5/glide3/src/Makefile.win32
View File

@@ -51,9 +51,9 @@ GLIDE_DLL = glide3x.dll
GLIDE_IMP = glide3x.lib
TEXUS_EXE = texus2.exe
FX_GLIDE_SW = ..\..\..\swlibs
GLIDE_LIBDIR = ..\..\lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)\bin
FX_GLIDE_SW = ../../../swlibs
GLIDE_LIBDIR = ../../lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
###############################################################################
# tools
@@ -64,8 +64,8 @@ AS = nasm
LD = link
RC = rc
ifeq ($(wildcard $(addsuffix \rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst \,\,$(1))
ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst /,\,$(1))
else
UNLINK = $(RM) $(1)
endif
@@ -127,9 +127,9 @@ LDLIBS += LIBCMT.lib
OPTFLAGS ?= -G6 -O2
endif
CFLAGS += -I. -I..\..\incsrc -I..\..\minihwc
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 += -I. -I../../incsrc -I../../minihwc
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) $(OPTFLAGS)
ifeq ($(USE_3DNOW),1)
@@ -216,38 +216,38 @@ endif
GLIDE_OBJECTS += \
gthread.obj \
winsurf.obj \
..\..\minihwc\hwcio.obj \
..\..\minihwc\gdebug.obj \
..\..\minihwc\minihwc.obj \
..\..\minihwc\win_mode.obj
../../minihwc/hwcio.obj \
../../minihwc/gdebug.obj \
../../minihwc/minihwc.obj \
../../minihwc/win_mode.obj
# so that we don't need win9x ddk:
GLIDE_OBJECTS += \
..\..\minihwc\win9x.obj
../../minihwc/win9x.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
$(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)
@@ -260,19 +260,19 @@ endif
.c.obj:
$(CC) -Fo$@ $(CFLAGS) -c $<
.rc.res:
$(RC) -Fo$@ $(CDEFS) -I$(FX_GLIDE_SW)\fxmisc $<
$(RC) -Fo$@ $(CDEFS) -I$(FX_GLIDE_SW)/fxmisc $<
###############################################################################
# main
###############################################################################
all: glide3x $(TEXUS_EXEDIR)\$(TEXUS_EXE)
all: glide3x $(TEXUS_EXEDIR)/$(TEXUS_EXE)
glide3x: $(GLIDE_LIBDIR)\$(GLIDE_DLL)
glide3x: $(GLIDE_LIBDIR)/$(GLIDE_DLL)
$(GLIDE_LIBDIR)\$(GLIDE_DLL): $(GLIDE_OBJECTS) $(GLIDE_RES)
$(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)
$(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_IMP)
#ifeq ($(TEXUS2),1)
# $(CC) -o $@ $(CFLAGS) $^
#else
@@ -302,7 +302,7 @@ xdraw3_sse.obj: xdraw3.asm
xtexdl_sse2.obj: xtexdl.asm
$(AS) -o $@ $(ASFLAGS) -DGL_SSE2=1 $<
..\..\minihwc\win9x.obj: ..\..\minihwc\win9x.asm
../../minihwc/win9x.obj: ../../minihwc/win9x.asm
$(AS) -o $@ -O2 -fwin32 $<
$(GLIDE_OBJECTS): fxinline.h fxgasm.h fxbldno.h
@@ -313,16 +313,16 @@ fxinline.h: fxgasm.exe
fxgasm.h: fxgasm.exe
.\$< -hex > $@
fxgasm.exe: fxgasm.c ..\..\incsrc\gendate.h
fxgasm.exe: fxgasm.c ../../incsrc/gendate.h
$(CC) -o $@ $(CFLAGS) $<
..\..\incsrc\gendate.h: gendate.exe
../../incsrc/gendate.h: gendate.exe
.\$< > $@
fxbldno.h: fxbldno.exe
.\$< > $@
gendate.exe: ..\..\incsrc\gendate.c
gendate.exe: ../../incsrc/gendate.c
$(CC) -o $@ $(CFLAGS) $<
fxbldno.exe: fxbldno.c
@@ -334,16 +334,16 @@ fxbldno.exe: fxbldno.c
clean:
-$(call UNLINK,*.obj)
-$(call UNLINK,..\..\minihwc\*.obj)
-$(call UNLINK,../../minihwc/*.obj)
-$(call UNLINK,fxinline.h)
-$(call UNLINK,fxgasm.h)
-$(call UNLINK,..\..\incsrc\gendate.h)
-$(call UNLINK,../../incsrc/gendate.h)
-$(call UNLINK,fxbldno.h)
-$(call UNLINK,$(FX_GLIDE_SW)\texus2\lib\*.obj)
-$(call UNLINK,$(FX_GLIDE_SW)/texus2/lib/*.obj)
-$(call UNLINK,$(GLIDE_RES))
realclean: clean
-$(call UNLINK,$(GLIDE_LIBDIR)\glide3x.exp)
-$(call UNLINK,$(GLIDE_LIBDIR)\$(GLIDE_DLL))
-$(call UNLINK,$(GLIDE_LIBDIR)\$(GLIDE_IMP))
-$(call UNLINK,$(TEXUS_EXEDIR)\$(TEXUS_EXE))
-$(call UNLINK,$(GLIDE_LIBDIR)/glide3x.exp)
-$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_DLL))
-$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_IMP))
-$(call UNLINK,$(TEXUS_EXEDIR)/$(TEXUS_EXE))

156
glide3x/sst1/glide3/src/Makefile.win32
View File

@@ -42,9 +42,9 @@ GLIDE_IMP = glide3x.lib
TEXUS_EXE = texus2.exe
FX_GLIDE_HW ?= sst1
FX_GLIDE_SW = ..\..\..\swlibs
GLIDE_LIBDIR = ..\..\lib\$(FX_GLIDE_HW)
TEXUS_EXEDIR = $(FX_GLIDE_SW)\bin
FX_GLIDE_SW = ../../../swlibs
GLIDE_LIBDIR = ../../lib/$(FX_GLIDE_HW)
TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
###############################################################################
# tools
@@ -55,8 +55,8 @@ AS = nasm
LD = link
RC = rc
ifeq ($(wildcard $(addsuffix \rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst \,\,$(1))
ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst /,\,$(1))
else
UNLINK = $(RM) $(1)
endif
@@ -128,9 +128,9 @@ ifeq ($(FX_GLIDE_HW),sst96)
LDLIBS += gdi32.lib ddraw.lib dxguid.lib oldnames.lib
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 += -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) $(OPTFLAGS)
ifeq ($(USE_X86),1)
@@ -181,57 +181,57 @@ endif
ifeq ($(FX_GLIDE_HW),sst96)
GLIDE_OBJECTS += \
sst96.obj \
..\..\init\init96\init96.obj \
..\..\init\init96\dxdrvr.obj \
..\..\init\init96\initat3d.obj \
..\..\init\init96\initmcrx.obj
../../init/init96/init96.obj \
../../init/init96/dxdrvr.obj \
../../init/init96/initat3d.obj \
../../init/init96/initmcrx.obj
endif
GLIDE_OBJECTS += \
..\..\init\init.obj \
..\..\init\vgdrvr.obj \
..\..\init\vg96drvr.obj \
..\..\init\initvg\gamma.obj \
..\..\init\initvg\dac.obj \
..\..\init\initvg\video.obj \
..\..\init\initvg\parse.obj \
..\..\init\initvg\sli.obj \
..\..\init\initvg\util.obj \
..\..\init\initvg\info.obj \
..\..\init\initvg\print.obj \
..\..\init\initvg\gdebug.obj \
..\..\init\initvg\sst1init.obj \
$(FX_GLIDE_SW)\newpci\pcilib\sst1_pci.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxmsr.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxpci.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxw32.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxvxd.obj \
$(FX_GLIDE_SW)\newpci\pcilib\fxnt.obj \
../../init/init.obj \
../../init/vgdrvr.obj \
../../init/vg96drvr.obj \
../../init/initvg/gamma.obj \
../../init/initvg/dac.obj \
../../init/initvg/video.obj \
../../init/initvg/parse.obj \
../../init/initvg/sli.obj \
../../init/initvg/util.obj \
../../init/initvg/info.obj \
../../init/initvg/print.obj \
../../init/initvg/gdebug.obj \
../../init/initvg/sst1init.obj \
$(FX_GLIDE_SW)/newpci/pcilib/sst1_pci.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxmsr.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxpci.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxw32.obj \
$(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
$(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)
@@ -244,19 +244,19 @@ endif
.c.obj:
$(CC) -Fo$@ $(CFLAGS) -c $<
.rc.res:
$(RC) -Fo$@ $(CDEFS) -I$(FX_GLIDE_SW)\fxmisc $<
$(RC) -Fo$@ $(CDEFS) -I$(FX_GLIDE_SW)/fxmisc $<
###############################################################################
# main
###############################################################################
all: glide3x $(TEXUS_EXEDIR)\$(TEXUS_EXE)
all: glide3x $(TEXUS_EXEDIR)/$(TEXUS_EXE)
glide3x: $(GLIDE_LIBDIR)\$(GLIDE_DLL)
glide3x: $(GLIDE_LIBDIR)/$(GLIDE_DLL)
$(GLIDE_LIBDIR)\$(GLIDE_DLL): $(GLIDE_OBJECTS) $(GLIDE_RES)
$(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)
$(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_IMP)
#ifeq ($(TEXUS2),1)
# $(CC) -o $@ $(CFLAGS) $^
#else
@@ -275,25 +275,25 @@ xdraw96.obj: xdraw96.asm
$(AS) -o $@ $(ASFLAGS) $<
ifeq ($(FX_GLIDE_HW),sst96)
..\..\init\initvg\gamma.obj: ..\..\init\initvg\gamma.c
../../init/initvg/gamma.obj: ../../init/initvg/gamma.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\dac.obj: ..\..\init\initvg\dac.c
../../init/initvg/dac.obj: ../../init/initvg/dac.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\video.obj: ..\..\init\initvg\video.c
../../init/initvg/video.obj: ../../init/initvg/video.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\parse.obj: ..\..\init\initvg\parse.c
../../init/initvg/parse.obj: ../../init/initvg/parse.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\sli.obj: ..\..\init\initvg\sli.c
../../init/initvg/sli.obj: ../../init/initvg/sli.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\util.obj: ..\..\init\initvg\util.c
../../init/initvg/util.obj: ../../init/initvg/util.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\info.obj: ..\..\init\initvg\info.c
../../init/initvg/info.obj: ../../init/initvg/info.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\print.obj: ..\..\init\initvg\print.c
../../init/initvg/print.obj: ../../init/initvg/print.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\gdebug.obj: ..\..\init\initvg\gdebug.c
../../init/initvg/gdebug.obj: ../../init/initvg/gdebug.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
..\..\init\initvg\sst1init.obj: ..\..\init\initvg\sst1init.c
../../init/initvg/sst1init.obj: ../../init/initvg/sst1init.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
endif
@@ -314,17 +314,17 @@ fxgasm.exe: fxgasm.c
clean:
-$(call UNLINK,*.obj)
-$(call UNLINK,..\..\init\*.obj)
-$(call UNLINK,..\..\init\initvg\*.obj)
-$(call UNLINK,..\..\init\init96\*.obj)
-$(call UNLINK,$(FX_GLIDE_SW)\newpci\pcilib\*.obj)
-$(call UNLINK,../../init/*.obj)
-$(call UNLINK,../../init/initvg/*.obj)
-$(call UNLINK,../../init/init96/*.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)
-$(call UNLINK,$(FX_GLIDE_SW)/texus2/lib/*.obj)
-$(call UNLINK,$(GLIDE_RES))
realclean: clean
-$(call UNLINK,$(GLIDE_LIBDIR)\glide3x.exp)
-$(call UNLINK,$(GLIDE_LIBDIR)\$(GLIDE_DLL))
-$(call UNLINK,$(GLIDE_LIBDIR)\$(GLIDE_IMP))
-$(call UNLINK,$(TEXUS_EXEDIR)\$(TEXUS_EXE))
-$(call UNLINK,$(GLIDE_LIBDIR)/glide3x.exp)
-$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_DLL))
-$(call UNLINK,$(GLIDE_LIBDIR)/$(GLIDE_IMP))
-$(call UNLINK,$(TEXUS_EXEDIR)/$(TEXUS_EXE))