Ok. now it compiles svgalib and 3dfx.. at least on my system :)

This commit is contained in:
Eric Windisch 1999-12-31 04:18:13 +00:00
parent c2681485bf
commit 18446beeca
2 changed files with 4 additions and 4 deletions

View file

@ -256,7 +256,7 @@ ALL_SVGA_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(SVGA_VID_SRC) model.c
OBJSquake-svga= $(patsubst %,$(BUILD_DIR)/svga/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_SVGA_SRC) .c .s))) OBJSquake-svga= $(patsubst %,$(BUILD_DIR)/svga/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_SVGA_SRC) .c .s)))
SVGA_CFLAGS = SVGA_CFLAGS =
SVGA_LDFLAGS = -lvga SVGA_LDFLAGS = -lvga -lm
SVGA_VID_SRC = vid_svgalib.c SVGA_VID_SRC = vid_svgalib.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
@ -358,7 +358,7 @@ ifneq ($(TDFXQUAKE),)
OBJSquake-3dfx = $(patsubst %,$(BUILD_DIR)/3dfx/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_TDFX_SRC) .c .s))) OBJSquake-3dfx = $(patsubst %,$(BUILD_DIR)/3dfx/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_TDFX_SRC) .c .s)))
TDFX_CFLAGS = -DGLQUAKE @OGL_CFLAGS@ @GLIDE_CFLAGS@ TDFX_CFLAGS = -DGLQUAKE @OGL_CFLAGS@ @GLIDE_CFLAGS@
TDFX_LDFLAGS = $(SVGA_LDFLAGS) @GLIDE_LDFLAGS@ @TDFXGL_LDFLAGS@ -ldl TDFX_LDFLAGS = $(SVGA_LDFLAGS) @GLIDE_LDFLAGS@ @TDFXGL_LDFLAGS@ -ldl -lGL
# XXX - this is for 3dfxgl # XXX - this is for 3dfxgl
TDFX_VID_SRC = gl_vidlinux.c TDFX_VID_SRC = gl_vidlinux.c

View file

@ -239,7 +239,7 @@ ALL_SVGA_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(SVGA_VID_SRC) model.c
OBJSquake-svga= $(patsubst %,$(BUILD_DIR)/svga/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_SVGA_SRC) .c .s))) OBJSquake-svga= $(patsubst %,$(BUILD_DIR)/svga/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_SVGA_SRC) .c .s)))
SVGA_CFLAGS = SVGA_CFLAGS =
SVGA_LDFLAGS = -lvga SVGA_LDFLAGS = -lvga -lm
SVGA_VID_SRC = vid_svgalib.c SVGA_VID_SRC = vid_svgalib.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
@ -329,7 +329,7 @@ ifneq ($(TDFXQUAKE),)
OBJSquake-3dfx = $(patsubst %,$(BUILD_DIR)/3dfx/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_TDFX_SRC) .c .s))) OBJSquake-3dfx = $(patsubst %,$(BUILD_DIR)/3dfx/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_TDFX_SRC) .c .s)))
TDFX_CFLAGS = -DGLQUAKE @OGL_CFLAGS@ @GLIDE_CFLAGS@ TDFX_CFLAGS = -DGLQUAKE @OGL_CFLAGS@ @GLIDE_CFLAGS@
TDFX_LDFLAGS = $(SVGA_LDFLAGS) @GLIDE_LDFLAGS@ @TDFXGL_LDFLAGS@ -ldl TDFX_LDFLAGS = $(SVGA_LDFLAGS) @GLIDE_LDFLAGS@ @TDFXGL_LDFLAGS@ -ldl -lGL
# XXX - this is for 3dfxgl # XXX - this is for 3dfxgl
TDFX_VID_SRC = gl_vidlinux.c TDFX_VID_SRC = gl_vidlinux.c