qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-02-16 16:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved -lm to global LDFLAGS, everything but the GL renderer needs it ajd

Browse source 
on at least some platforms the GL renderer needs it too.
This commit is contained in:
Joseph Carter 2000-01-03 10:25:01 +00:00
parent 24312dcadd
commit 5761d2f334
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AUTHORS
View file

@ -52,6 +52,10 @@ Documentation:
Nelson J. Rush <chesterrr@att.net> Nelson J. Rush <chesterrr@att.net>
Joseph Carter <knghtbrd@debian.org> Joseph Carter <knghtbrd@debian.org>
GGI support:
Marcus Sundberg <mackan@stacken.kth.se>
SDL Support: SDL Support:
Sam Lantinga <slouken@devolution.com> Sam Lantinga <slouken@devolution.com>
Maas van den Berg <email@dds.nl> Maas van den Berg <email@dds.nl>

12
qw_client/Makefile.in
View file

@ -17,7 +17,7 @@ mandir = @mandir@
BUILD_DIR = ../targets/qw_client BUILD_DIR = ../targets/qw_client
LDFLAGS = @LDFLAGS@ @SND_LIBS@ LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm
LIBS = @LIBS@ LIBS = @LIBS@
CC = @CC@ CC = @CC@
INTEL_ARCH = @INTEL_ARCH@ INTEL_ARCH = @INTEL_ARCH@
@ -232,7 +232,7 @@ ifneq ($(X11QUAKE),)
OBJSquake-x11 = $(patsubst %,$(BUILD_DIR)/x11/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_X11_SRC) .c .s))) OBJSquake-x11 = $(patsubst %,$(BUILD_DIR)/x11/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_X11_SRC) .c .s)))
X11_CFLAGS = -DX11 @X_CFLAGS@ X11_CFLAGS = -DX11 @X_CFLAGS@
X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@ -lm X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@
# 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
# sub-directory is created # sub-directory is created
@ -279,7 +279,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_CFLAGS = @SVGA_CFLAGS@
SVGA_LDFLAGS = @SVGA_LIBS@ -lm SVGA_LDFLAGS = @SVGA_LIBS@
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
@ -334,7 +334,7 @@ ALL_GGI_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(GGI_VID_SRC) model.c
OBJSquake-ggi = $(patsubst %,$(BUILD_DIR)/ggi/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_GGI_SRC) .c .s))) OBJSquake-ggi = $(patsubst %,$(BUILD_DIR)/ggi/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_GGI_SRC) .c .s)))
GGI_CFLAGS = -DGGI @GGI_CFLAGS@ GGI_CFLAGS = -DGGI @GGI_CFLAGS@
GGI_LDFLAGS = @GGI_LIBS@ -lm GGI_LDFLAGS = @GGI_LIBS@
GGI_VID_SRC = vid_ggi.c GGI_VID_SRC = vid_ggi.c
# This can be thought of as a macro that makes sure that the ggi # This can be thought of as a macro that makes sure that the ggi
@ -431,7 +431,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_LIBS@ @TDFXGL_LIBS@ -lm TDFX_LDFLAGS = @SVGA_LIBS@ @TDFXGL_LIBS@
TDFX_VID_SRC = gl_vidlinux_3dfx.c TDFX_VID_SRC = gl_vidlinux_3dfx.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
@ -481,7 +481,7 @@ ALL_SDL_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(SDL_VID_SRC) model.c
OBJSquake-sdl= $(patsubst %,$(BUILD_DIR)/sdl/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_SDL_SRC) .c .s))) OBJSquake-sdl= $(patsubst %,$(BUILD_DIR)/sdl/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_SDL_SRC) .c .s)))
SDL_CFLAGS = @SDL_CFLAGS@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_LDFLAGS = @SDL_LIBS@ -lm SDL_LDFLAGS = @SDL_LIBS@
SDL_VID_SRC = vid_sdl.c SDL_VID_SRC = vid_sdl.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

4
qw_server/Makefile.in
View file

@ -16,7 +16,7 @@ COMMON_DIR=$(PROJECT_DIR)/common
QW_COMMON_DIR= $(PROJECT_DIR)/qw_common QW_COMMON_DIR= $(PROJECT_DIR)/qw_common
BUILD_DIR = ../targets/qw_server BUILD_DIR = ../targets/qw_server
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@ -lm
LIBS = @LIBS@ LIBS = @LIBS@
CC = @CC@ CC = @CC@
INTEL_ARCH = @INTEL_ARCH@ INTEL_ARCH = @INTEL_ARCH@
@ -100,7 +100,7 @@ OBJSqw-server = $(patsubst %,$(BUILD_DIR)/srv/%, \
SRV_CFLAGS = -DSRV $(X_CFLAGS) SRV_CFLAGS = -DSRV $(X_CFLAGS)
# XXX - Don't use X_EXTRA_LIBS below # XXX - Don't use X_EXTRA_LIBS below
SRV_LDFLAGS = @X_EXTRA_LIBS@ -lm SRV_LDFLAGS = @X_EXTRA_LIBS@
MAKE_SURE_srv_DIR = @DIR=srv; $(MAKE_SURE_DIR) MAKE_SURE_srv_DIR = @DIR=srv; $(MAKE_SURE_DIR)
$(BUILD_DIR)/srv/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/srv/%.o: $(SRC_DIR)/%.c

12
uquake/Makefile.in
View file

@ -16,7 +16,7 @@ mandir = @mandir@
COMMON_DIR=$(PROJECT_DIR)/common COMMON_DIR=$(PROJECT_DIR)/common
BUILD_DIR =../targets/uquake BUILD_DIR =../targets/uquake
LDFLAGS = @LDFLAGS@ @SND_LIBS@ LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm
LIBS = @LIBS@ LIBS = @LIBS@
CC = @CC@ CC = @CC@
INTEL_ARCH = @INTEL_ARCH@ INTEL_ARCH = @INTEL_ARCH@
@ -216,7 +216,7 @@ ifneq ($(X11QUAKE),)
OBJSquake-x11 = $(patsubst %,$(BUILD_DIR)/x11/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_X11_SRC) .c .s))) OBJSquake-x11 = $(patsubst %,$(BUILD_DIR)/x11/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_X11_SRC) .c .s)))
X11_CFLAGS = -DX11 @X_CFLAGS@ X11_CFLAGS = -DX11 @X_CFLAGS@
X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@ -lm X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@
# 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
# sub-directory is created # sub-directory is created
@ -257,7 +257,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_CFLAGS = @SVGA_CFLAGS@
SVGA_LDFLAGS = @SVGA_LIBS@ -lm SVGA_LDFLAGS = @SVGA_LIBS@
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
@ -306,7 +306,7 @@ ALL_GGI_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(GGI_VID_SRC) model.c
OBJSquake-ggi = $(patsubst %,$(BUILD_DIR)/ggi/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_GGI_SRC) .c .s))) OBJSquake-ggi = $(patsubst %,$(BUILD_DIR)/ggi/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_GGI_SRC) .c .s)))
GGI_CFLAGS = -DGGI @GGI_CFLAGS@ GGI_CFLAGS = -DGGI @GGI_CFLAGS@
GGI_LDFLAGS = @GGI_LIBS@ -lm GGI_LDFLAGS = @GGI_LIBS@
GGI_VID_SRC = vid_ggi.c GGI_VID_SRC = vid_ggi.c
# This can be thought of as a macro that makes sure that the ggi # This can be thought of as a macro that makes sure that the ggi
@ -390,7 +390,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_LIBS@ @TDFXGL_LIBS@ -lm TDFX_LDFLAGS = @SVGA_LIBS@ @TDFXGL_LIBS@
TDFX_VID_SRC = gl_vidlinux_3dfx.c TDFX_VID_SRC = gl_vidlinux_3dfx.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
@ -434,7 +434,7 @@ ALL_SDL_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(SDL_VID_SRC) model.c
OBJSquake-sdl= $(patsubst %,$(BUILD_DIR)/sdl/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_SDL_SRC) .c .s))) OBJSquake-sdl= $(patsubst %,$(BUILD_DIR)/sdl/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_SDL_SRC) .c .s)))
SDL_CFLAGS = @SDL_CFLAGS@ -DSDL SDL_CFLAGS = @SDL_CFLAGS@ -DSDL
SDL_LDFLAGS = @SDL_LIBS@ -lm SDL_LDFLAGS = @SDL_LIBS@
SDL_VID_SRC = vid_sdl.c SDL_VID_SRC = vid_sdl.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