mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-10 14:42:06 +00:00
do alsa (sound in general) lib support the Right Way (tm)
missed 3dfx for gl
This commit is contained in:
parent
e489bb2b00
commit
5e4575222d
2 changed files with 3 additions and 8 deletions
|
@ -22,7 +22,7 @@ TARGET_DIR := $(PROJECT_ODIR)/targets
|
|||
BUILD_DIR := $(TARGET_DIR)/qw_client
|
||||
OBJ_PATTERN := $(shell echo $(BUILD_DIR)/{client,common_lib}/%.o)
|
||||
|
||||
LDFLAGS = @LDFLAGS@ @NET_LIBS@ -lm
|
||||
LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm
|
||||
LIBS = @LIBS@
|
||||
CC = @CC@
|
||||
INTEL_ARCH = @INTEL_ARCH@
|
||||
|
@ -57,11 +57,6 @@ MAKE_SURE_DIR = if test -d "$(BUILD_DIR)/$$DIR"; \
|
|||
|
||||
COMMON_LIB=common_lib.a
|
||||
|
||||
SOUND_STYLE = @SOUND_STYLE@
|
||||
ifeq ($(SOUND_STYLE),ALSA)
|
||||
LIBS += -lasound
|
||||
endif
|
||||
|
||||
ifeq ($(HAS_SVGA),yes)
|
||||
SVGAQUAKE = $(BIN_PREFIX)-svga
|
||||
endif
|
||||
|
@ -427,7 +422,7 @@ ifneq ($(TDFXQUAKE),)
|
|||
|
||||
ALL_TDFX_SRC = $(GL_REND_SRC) \
|
||||
gl_vidlinux_3dfx.c in_svgalib.c
|
||||
ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/client/%,$(addsuffix .@OBJEXT@,\
|
||||
ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/client/gl/%,$(addsuffix .@OBJEXT@,\
|
||||
$(basename $(ALL_TDFX_SRC) .c .s))) \
|
||||
$(BUILD_DIR)/common_lib.a $(TARGET_DIR)/sound_lib.a
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ mandir = @mandir@
|
|||
|
||||
BUILD_DIR = $(PROJECT_ODIR)/targets/uquake
|
||||
|
||||
LDFLAGS = @LDFLAGS@ @SND_LIBS@ @NET_LIBS@ -lm
|
||||
LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm
|
||||
LIBS = @LIBS@
|
||||
CC = @CC@
|
||||
INTEL_ARCH = @INTEL_ARCH@
|
||||
|
|
Loading…
Reference in a new issue