ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow linking against an external speex library

This commit is contained in:
Ludwig Nussel 2008-06-05 08:55:08 +00:00
parent 86c42edf6b
commit 35e2091c90
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -133,6 +133,10 @@ ifndef USE_VOIP
USE_VOIP=1
endif
ifndef USE_INTERNAL_SPEEX
USE_INTERNAL_SPEEX=1
endif
ifndef USE_LOCAL_HEADERS
USE_LOCAL_HEADERS=1
endif
@ -796,7 +800,12 @@ ifeq ($(USE_MUMBLE),1)
endif
ifeq ($(USE_VOIP),1)
BASE_CFLAGS += -DUSE_VOIP -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
BASE_CFLAGS += -DUSE_VOIP
ifeq ($(USE_INTERNAL_SPEEX),1)
BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
else
CLIENT_LDFLAGS += -lspeex
endif
endif
ifdef DEFAULT_BASEDIR
@ -1338,7 +1347,7 @@ ifeq ($(ARCH),x86)
$(B)/client/snapvectora.o
endif
ifeq ($(USE_VOIP),1)
ifeq ($(USE_INTERNAL_SPEEX),1)
Q3OBJ += \
$(B)/client/bits.o \
$(B)/client/buffer.o \