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

Fix autotool build system.

Browse Source
This commit is contained in:
guillemj
2004-01-25 11:03:04 +00:00
parent 3b11585bb0
commit 873a724200
7 changed files with 44 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glide3x/cvg/init/makefile.autoconf.am
View File

@@ -42,12 +42,8 @@
## $Revision$
## $Date$
##
if GLIDE_DEBUG
else
GLIDE_DEBUG_VDEFS = -g
endif
LDEFS = -DINIT_LINUX $(GLIDE_DEBUG_VDEFS)
LDEFS = -DINIT_LINUX
lib_LTLIBRARIES = libsst1init.la
libsst1init_la_SOURCES = sst1init.c info.c print.c parse.c \

35
glide3x/h3/glide3/src/makefile.autoconf.am
View File

@@ -66,7 +66,7 @@ if FX_GLIDE_CTRISETUP
FX_GLIDE_CTRISETUP_VDEFS = -DGLIDE_USE_C_TRISETUP
else
FX_GLIDE_CTRISETUP_VDEFS = -DGLIDE_PACKED_RGB=0 \
-DGLIDE_TRI_CULLING=1
-DGLIDE_TRI_CULLING=1
endif
if FX_GLIDE_NO_PLUG
@@ -100,6 +100,10 @@ if GL_AMD3D
GL_AMD3D_SRC = xtexdl_3dnow.S xdraw2_3dnow.S xdraw3_3dnow.S
endif
if HAL_CSIM
HAL_CSIM_INCLUDES = -I@top_srcdir@/@FX_GLIDE_HW@/csim
endif
VDEFS = $(FX_CHRIS_DENIS_ANTHONY_HACK_VDEFS) \
$(FX_GLIDE_ALT_TAB_VDEFS) \
$(FX_GLIDE_DIRECT_WRITE_VDEFS) \
@@ -109,7 +113,8 @@ VDEFS = $(FX_CHRIS_DENIS_ANTHONY_HACK_VDEFS) \
$(FX_GLIDE_CTRISETUP_VDEFS) \
$(FX_GLIDE_NO_PLUG_VDEFS) \
$(FX_GLIDE_NO_SPLASH_VDEFS) \
$(GLIDE_DEBUG_VDEFS)
$(GLIDE_DEBUG_VDEFS) \
$(HAL_CSIM_INCLUDES)
LDEFS = -DGLIDE_INIT_HWC \
-DGLIDE_LIB \
@@ -117,31 +122,17 @@ LDEFS = -DGLIDE_INIT_HWC \
-DGLIDE3_ALPHA \
-DH3
#
# Now, we define the includes, first the variable ones,
# and then the fixed ones.
#
if HAL_CSIM
HAL_CSIM_INCLUDES = -I@top_srcdir@/@FX_GLIDE_HW@/csim
endif
VINCLUDES = $(HAL_CSIM_INCLUDES)
#
# Nothing for CPPFLAGS or OPTS here.
#
#
# Special rules for assembly files.
#
cpudtect.o cpudtect.lo: cpudtect.S
libtool --mode=compile $(CC) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(AFLAGS) -c -o $*.o $<
libtool --mode=compile $(CCAS) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(CCASFLAGS) -c -o $*.o $<
xdraw2_def.o xdraw2_def.lo: xdraw2.S xdraw2.inc.S fxgasm.h
libtool --mode=compile $(CC) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(AFLAGS) -c -o $*.o $<
libtool --mode=compile $(CCAS) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(CCASFLAGS) -c -o $*.o $<
xdraw3_def.o xdraw3_def.lo: xdraw3.S fxgasm.h
libtool --mode=compile $(CC) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(AFLAGS) -c -o $*.o $<
libtool --mode=compile $(CCAS) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(CCASFLAGS) -c -o $*.o $<
# 3DNow!(tm) dependencies
# XXX_def.obj targets are the default targets
@@ -149,13 +140,13 @@ xdraw3_def.o xdraw3_def.lo: xdraw3.S fxgasm.h
if GL_AMD3D
xdraw2_3dnow.o xdraw2_3dnow.lo: xdraw2.S xdraw2.inc.S fxgasm.h
libtool --mode=compile $(CC) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $*.o $<
libtool --mode=compile $(CCAS) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(CCASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $*.o $<
xdraw3_3dnow.o xdraw3_3dnow.lo: xdraw3.S fxgasm.h
libtool --mode=compile $(CC) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $*.o $<
libtool --mode=compile $(CCAS) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(CCASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $*.o $<
xtexdl_3dnow.o xtexdl_3dnow.lo: xtexdl.S fxgasm.h
libtool --mode=compile $(CC) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $*.o $<
libtool --mode=compile $(CCAS) -$$ -I$(top_builddir)/@FX_GLIDE_HW@/glide3/src $(CCASFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $*.o $<
endif

16
glide3x/h5/glide3/src/makefile.autoconf.am
View File

@@ -130,6 +130,11 @@ FX_GLIDE_CTRISETUP_VDEFS = -DGLIDE_USE_C_TRISETUP
else
FX_GLIDE_CTRISETUP_VDEFS = -DGLIDE_PACKED_RGB=0 -DGLIDE_TRI_CULLING=1
endif
if HAL_CSIM
HAL_CSIM_INCLUDES = -I@top_srcdir@/@FX_GLIDE_HW@/csim
endif
VDEFS = $(FX_CHRIS_DENIS_ANTHONY_HACK_VDEFS) \
$(FX_GLIDE_ALT_TAB_VDEFS) \
$(FX_GLIDE_DIRECT_WRITE_VDEFS) \
@@ -151,19 +156,14 @@ VDEFS = $(FX_CHRIS_DENIS_ANTHONY_HACK_VDEFS) \
$(HAL_CSIM_VDEFS) \
$(HAL_HW_VDEFS) \
$(FX_GLIDE_HW_CULL_VDEFS) \
$(FX_GLIDE_CTRISETUP_VDEFS)
$(FX_GLIDE_CTRISETUP_VDEFS) \
$(HAL_CSIM_INCLUDES)
LDEFS = -DGLIDE_LIB -DGLIDE3 -DGLIDE3_ALPHA -DH3 $(CMDXPORTDEFS)
#
# Now, we define the includes, first the variable ones,
# and then the fixed ones.
# Special rules for assembly files.
#
if HAL_CSIM
HAL_CSIM_INCLUDES = -I@top_srcdir@/@FX_GLIDE_HW@/csim
endif
VINCLUDES = $(HAL_CSIM_INCLUDES)
#
# Nothing for CPPFLAGS or OPTS here.

8
glide3x/h5/minihwc/makefile.autoconf.am
View File

@@ -24,13 +24,7 @@
# First, the variable defs.
#
if GLIDE_DEBUG
GLIDE_DEBUG_VDEFS=-DGDBG_INFO_ON
endif
OSDEPC = linhwc.c
VDEFS = $(GLIDE_DEBUG_VDEFS)
OSDEPC = linhwc.c
noinst_LTLIBRARIES = libminihwc.la
libminihwc_la_SOURCES = hwcio.c gdebug.c $(OSDEPC)

68
swlibs/include/make/makefile.autoconf.bottom
View File

@@ -20,54 +20,25 @@
## $Revision$
## $Date$
##
#
# Always set make, so that we get the right makefile.
MAKE=@MAKE@
#
# Here we have global definitions.
#
#
# Then we have compiler flag definitions.
#
CPPFLAGS = $(GCPPFLAGS) $(LCPPFLAGS) $(VCPPFLAGS)
DEFS = $(GDEFS) $(LDEFS) $(VDEFS)
INCLUDES = $(GINCLUDES) $(LINCLUDES) $(VINCLUDES)
CFLAGS = $(GCFLAGS) $(LCFLAGS) $(VCFLAGS)
AFLAGS = $(GAFLAGS) $(LAFLAGS) $(VAFLAGS)
ADEFS = $(GADEFS) $(LADEFS) $(VADEFS)
AINCLUDES = $(GAINCLUDES) $(LAINCLUDES) $(VAINCLUDES)
AOPTS = $(GAOPTS) $(LAOPTS) $(VAOPTS)
#
# User Overrideable FLAGS
#
########################################################################
#
# Compilation flags, options and includes
#
########################################################################
#
# Global CFLAGS
#
ifeq ("@GLIDE_DEBUG@","true")
GLIDE_DEBUG_GCFLAGS = -g -O
GLIDE_DEBUG_GDEFS = -DGDBG_INFO_ON -DGLIDE_DEBUG
GLIDE_DEBUG_CFLAGS = -O
GLIDE_DEBUG_CPPFLAGS = -DGDBG_INFO_ON -DGLIDE_DEBUG
else
GLIDE_DEBUG_GCFLAGS = -O6 -mcpu=pentium
GLIDE_DEBUG_GDEFS = -fomit-frame-pointer -funroll-loops \
-fexpensive-optimizations -ffast-math -DBIG_OPT
GLIDE_DEBUG_CFLAGS = -O6 -mcpu=pentium -fomit-frame-pointer -funroll-loops \
-fexpensive-optimizations -ffast-math -DBIG_OPT
endif
GCFLAGS = $(GLIDE_DEBUG_GCFLAGS)
#
# Global DEFS
#
# This variable may require -DENDB. The original Linux build
# used it, but the Windows build didn't. It seems to mean
# Big Endian, which is not the case for the x86. It is only
# used in texus2 as far as I can see.
#
GDEFS=-DX11 $(GLIDE_DEBUG_GDEFS) -Wall
#
# Global INCLUDES
#
CFLAGS = -Wall -g $(GLIDE_DEBUG_CFLAGS)
CPPFLAGS = @CPPFLAGS@ $(GLIDE_DEBUG_CPPFLAGS)
ifeq ("@FX_GLIDE_HW@","cvg")
CVG_VINCLUDES= -I$(top_srcdir)/init \
-I$(top_srcdir)/cvg/glide3/src \
@@ -88,15 +59,16 @@ H5_VINCLUDES = -I$(top_srcdir)/h5/glide3/src \
-I$(top_srcdir)/h5/minihwc
endif
GINCLUDES = $(CVG_VINCLUDES) $(H3_VINCLUDES) $(H5_VINCLUDES) \
-I. \
# This variable may require -DENDB. The original Linux build
# used it, but the Windows build didn't. It seems to mean
# Big Endian, which is not the case for the x86. It is only
# used in texus2 as far as I can see.
AM_CPPFLAGS = -DX11 $(LDEFS) $(VDEFS) \
$(CVG_VINCLUDES) $(H3_VINCLUDES) $(H5_VINCLUDES) \
-I. \
-I$(top_srcdir)/swlibs/fxmemmap \
-I$(top_srcdir)/swlibs/fxmisc \
-I$(top_srcdir)/swlibs/newpci/pcilib \
-I$(top_srcdir)/swlibs/@TEXTURE_UTILITIES_DIR@/lib
########################################################################
#
# Linker definitions
#
########################################################################

4
swlibs/newpci/pcilib/makefile.autoconf.am
View File

@@ -20,16 +20,12 @@
## $Revision$
## $Date$
##
if GLIDE_DEBUG
GLIDE_DEBUG_DEFS = -DGDBG_INFO_ON
endif
if DRI_BUILD
DRI_BUILD_VDEFS = -DDRI_BUILD
endif
VDEFS = $(DRI_BUILD_VDEFS)
LDEFS = $(GLIDE_DEBUG_DEFS)
noinst_HEADERS = fxpci.h sst1_pci.h pcilib.h
noinst_LTLIBRARIES = libfxpci.la

2
swlibs/texus2/lib/makefile.autoconf.am
View File

@@ -25,7 +25,7 @@
#
if GLIDE_DEBUG
DBGOPTS = -DHWC_DEBUG -g
DBGOPTS = -DHWC_DEBUG
endif
LDEFS = -DGLIDE_DIAGS -DHWC_CSIM -DGLIDE3 -DGLIDE3_ALPHA \
-DGD_DEBUGGING -DGLIDE_SIMULATOR $(DBGOPTS)