convert win32 Makefiles to crlf, convert path separators to backslash.

This commit is contained in:
sezero
2018-08-08 14:56:02 +03:00
parent 8adf484af7
commit 8c917cb2a2
5 changed files with 1369 additions and 1370 deletions

View File

@@ -1,4 +1,4 @@
# Win32 makefile for Glide3 and Texus2
# Win32 makefile for Glide3 and Texus2, using Visual Studio (cl.exe)
# This makefile MUST be processed by GNU make!!!
#
# Copyright (c) 2003 - Daniel Borca
@@ -8,7 +8,6 @@
# $Header$
#
#
# Available options:
#
@@ -52,16 +51,15 @@
#
.PHONY: all clean realclean
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:

View File

@@ -1,4 +1,4 @@
# Win32 makefile for Glide3/CVG and Texus2
# Win32 makefile for Glide3/CVG and Texus2, using Visual Studio (cl.exe)
# This makefile MUST be processed by GNU make!!!
#
# Copyright (c) 2004 - Daniel Borca
@@ -51,9 +51,9 @@ GLIDE_IMP = glide3x.lib
TEXUS_EXE = texus2.exe
FX_GLIDE_HW ?= cvg
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
@@ -130,9 +130,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)
@@ -201,48 +201,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)
@@ -255,19 +255,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
@@ -298,10 +298,10 @@ xtexdl_3dnow.obj: xtexdl.asm
$(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) $<
@@ -312,15 +312,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))

View File

@@ -1,4 +1,4 @@
# Win32 makefile for Glide3/H3 and Texus2
# Win32 makefile for Glide3/H3 and Texus2, using Visual Studio (cl.exe)
# This makefile MUST be processed by GNU make!!!
#
# Copyright (c) 2004 - Daniel Borca
@@ -49,9 +49,9 @@ GLIDE_IMP = glide3x.lib
TEXUS_EXE = texus2.exe
FX_GLIDE_HW ?= h3
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
@@ -62,8 +62,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
@@ -123,9 +123,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)
@@ -186,35 +186,35 @@ 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
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)
@@ -227,19 +227,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
@@ -280,14 +280,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))

View File

@@ -1,4 +1,4 @@
# Win32 makefile for Glide3/H5 and Texus2
# Win32 makefile for Glide3/H5 and Texus2, using Visual Studio (cl.exe)
# This makefile MUST be processed by GNU make!!!
#
# Copyright (c) 2004 - Daniel Borca
@@ -54,9 +54,9 @@ GLIDE_IMP = glide3x.lib
TEXUS_EXE = texus2.exe
FX_GLIDE_HW ?= h5
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
@@ -67,8 +67,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
@@ -130,9 +130,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)
@@ -219,35 +219,35 @@ 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
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
@@ -305,21 +305,21 @@ xtexdl_sse2.obj: xtexdl.asm
$(GLIDE_OBJECTS): fxinline.h fxgasm.h fxbldno.h
fxinline.h: fxgasm.exe
./$< -inline > $@
.\$< -inline > $@
fxgasm.h: fxgasm.exe
./$< -hex > $@
.\$< -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
@@ -331,16 +331,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))

View File

@@ -1,4 +1,4 @@
# Win32 makefile for Glide3/SST1 and Texus2
# Win32 makefile for Glide3/SST1 and Texus2, using Visual Studio (cl.exe)
# This makefile MUST be processed by GNU make!!!
#
# Copyright (c) 2004 - Daniel Borca
@@ -42,9 +42,9 @@ GLIDE_IMP = glide3x.lib
TEXUS_EXE = texus2.exe
FX_GLIDE_HW ?= sst1
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
@@ -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
@@ -82,6 +82,7 @@ CDEFS += -DSST96_FIFO
#CDEFS += -DINIT96VGASWAP
#CDEFS += -DINIT_ACCESS_DIRECT
CDEFS += -DGLIDE_USE_ALT_REGMAP
GLIDE_LIBDIR = ..\..\lib\sst96
endif
endif
@@ -126,9 +127,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)
@@ -182,57 +183,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)
@@ -245,19 +246,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
@@ -276,35 +277,35 @@ 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
$(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) $<
@@ -315,17 +316,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))