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

linux makefile updates

Browse Source
This commit is contained in:
sezero
2018-08-12 15:51:28 +03:00
parent 76d8804c33
commit 99f02c80e6
5 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
glide3x/cvg/glide3/src/makefile.linux
View File

@@ -9,8 +9,6 @@
# Available options:
#
# Environment variables:
# FX_GLIDE_HW build for the given ASIC (cvg).
# default = cvg
# OPTFLAGS pass given optimization flags to compiler
# default = -O2 -ffast-math
# DEBUG=1 enable debugging checks and messages
@@ -35,7 +33,6 @@
# realclean: remove all generated files
#
.PHONY: all glide3x clean realclean
.INTERMEDIATE: fxgasm
.SUFFIXES: .lo
@@ -56,7 +53,6 @@ TEXUS_EXE = texus2
GLIDE_SONAME = $(GLIDE_SO).$(GLIDE_VERSION_MAJOR)
GLIDE_SHARED = $(GLIDE_SONAME).$(GLIDE_VERSION_MINOR)
FX_GLIDE_HW ?= cvg
FX_GLIDE_SW = ../../../swlibs
GLIDE_LIBDIR = ../../lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
@@ -179,7 +175,7 @@ GLIDE_OBJECTS += \
xdraw3_def.o
ifeq ($(USE_MMX),1)
GLIDE_OBJECTS += \
xtexdl_mmx.obj
xtexdl_mmx.o
endif
ifeq ($(USE_3DNOW),1)
GLIDE_OBJECTS += \
@@ -211,8 +207,8 @@ GLIDE_OBJECTS += \
# fxremap() not called in linux builds
# ../../init/fxremap.o
# FIXME: needed for now to match the old library signature, should be checked
# if it's really needed.
# FIXME: these are to match the old library signature.
# Should be checked if it's really needed.
GLIDE_OBJECTS += \
$(FX_GLIDE_SW)/fxmisc/fxos.o \
$(FX_GLIDE_SW)/fxmisc/fximg.o
@@ -290,7 +286,7 @@ xdraw3_def.o: xdraw3.asm
$(AS) -o $@ $(ASFLAGS) $<
xtexdl_def.o: xtexdl.c
$(CC) -o $@ $(CFLAGS) -c $<
xtexdl_mmx.obj: xtexdl.asm
xtexdl_mmx.o: xtexdl.asm
$(AS) -o $@ $(ASFLAGS) -DGL_MMX=1 $<
xdraw2_3dnow.o: xdraw2.asm
$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
@@ -307,6 +303,8 @@ xdraw3_def.lo: xdraw3_def.o
$(CP) $< $@
xtexdl_def.lo: xtexdl.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -c $<
xtexdl_mmx.lo: xtexdl_mmx.o
$(CP) $< $@
xdraw2_3dnow.lo: xdraw2_3dnow.o
$(CP) $< $@
xdraw3_3dnow.lo: xdraw3_3dnow.o
@@ -330,7 +328,7 @@ fxgasm: fxgasm.c
###############################################################################
clean:
-$(RM) *.o *.obj *.lo
-$(RM) *.o *.lo
-$(RM) ../../init/*.o ../../init/*.lo
-$(RM) $(FX_GLIDE_SW)/newpci/pcilib/*.o $(FX_GLIDE_SW)/newpci/pcilib/*.lo
-$(RM) $(FX_GLIDE_SW)/fxmisc/*.o $(FX_GLIDE_SW)/fxmisc/*.lo

8
glide3x/h3/glide3/src/makefile.linux
View File

@@ -9,8 +9,6 @@
# Available options:
#
# Environment variables:
# FX_GLIDE_HW build for the given ASIC (h3).
# default = h3
# DRI=1 Build DRI version.
# default = no
# DGA=1 Build DGA version (experimental).
@@ -39,7 +37,6 @@
# realclean: remove all generated files
#
.PHONY: all glide3x clean realclean
.INTERMEDIATE: fxgasm
.SUFFIXES: .lo
@@ -60,7 +57,6 @@ TEXUS_EXE = texus2
GLIDE_SONAME = $(GLIDE_SO).$(GLIDE_VERSION_MAJOR)
GLIDE_SHARED = $(GLIDE_SONAME).$(GLIDE_VERSION_MINOR)
FX_GLIDE_HW ?= h3
FX_GLIDE_SW = ../../../swlibs
GLIDE_LIBDIR = ../../lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
@@ -201,8 +197,8 @@ GLIDE_OBJECTS += \
../../minihwc/hwcio.o \
../../minihwc/gdebug.o
# FIXME: needed for now to match the old library signature, should be checked
# if it's really needed.
# FIXME: these are to match the old library signature.
# Should be checked if it's really needed.
GLIDE_OBJECTS += \
$(FX_GLIDE_SW)/fxmisc/fxos.o \
$(FX_GLIDE_SW)/fxmisc/fximg.o

7
glide3x/h5/glide3/src/makefile.linux
View File

@@ -9,8 +9,6 @@
# Available options:
#
# Environment variables:
# FX_GLIDE_HW build for the given ASIC (h5).
# default = h5
# DRI=1 Build DRI version.
# default = no
# DGA=1 Build DGA version (experimental).
@@ -65,7 +63,6 @@ TEXUS_EXE = texus2
GLIDE_SONAME = $(GLIDE_SO).$(GLIDE_VERSION_MAJOR)
GLIDE_SHARED = $(GLIDE_SONAME).$(GLIDE_VERSION_MINOR)
FX_GLIDE_HW ?= h5
FX_GLIDE_SW = ../../../swlibs
GLIDE_LIBDIR = ../../lib
TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
@@ -232,8 +229,8 @@ GLIDE_OBJECTS += \
../../minihwc/hwcio.o \
../../minihwc/gdebug.o
# FIXME: needed for now to match the old library signature, should be checked
# if it's really needed.
# FIXME: these are to match the old library signature.
# Should be checked if it's really needed.
GLIDE_OBJECTS += \
$(FX_GLIDE_SW)/fxmisc/fxos.o \
$(FX_GLIDE_SW)/fxmisc/fximg.o

1
glide3x/sst1/glide3/src/Makefile.wat
View File

@@ -79,6 +79,7 @@ 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

15
glide3x/sst1/glide3/src/makefile.linux
View File

@@ -4,15 +4,12 @@
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
#
# $Header$
#
#
# Available options:
#
# Environment variables:
# FX_GLIDE_HW build for the given ASIC (sst1, sst96).
# 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)
@@ -32,8 +29,6 @@
# realclean: remove all generated files
#
.PHONY: all glide3x clean realclean
.INTERMEDIATE: fxgasm
.SUFFIXES: .lo
@@ -78,6 +73,7 @@ CDEFS = -DINIT_LINUX
XPATH ?= /usr/X11R6/lib
ifeq ($(FX_GLIDE_HW),sst96)
LDFLAGS = -L$(XPATH)
## FIXME: no -lXxf86rush in new X versions
LDLIBS = -lX11 -lXxf86dga -lXxf86rush -lXxf86vm
endif
@@ -94,6 +90,9 @@ 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
endif
@@ -205,8 +204,8 @@ GLIDE_OBJECTS += \
$(FX_GLIDE_SW)/newpci/pcilib/fxpci.o \
$(FX_GLIDE_SW)/newpci/pcilib/fxlinux.o
# FIXME: needed for now to match the old library signature, should be checked
# if it's really needed.
# FIXME: these are to match the old library signature.
# Should be checked if it's really needed.
GLIDE_OBJECTS += \
$(FX_GLIDE_SW)/fxmisc/fxos.o \
$(FX_GLIDE_SW)/fxmisc/fximg.o