mirror of
https://github.com/UberGames/lilium-voyager.git
synced 2024-12-13 13:40:56 +00:00
allow linking against an external speex library
This commit is contained in:
parent
86c42edf6b
commit
35e2091c90
1 changed files with 11 additions and 2 deletions
13
Makefile
13
Makefile
|
@ -133,6 +133,10 @@ ifndef USE_VOIP
|
||||||
USE_VOIP=1
|
USE_VOIP=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifndef USE_INTERNAL_SPEEX
|
||||||
|
USE_INTERNAL_SPEEX=1
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef USE_LOCAL_HEADERS
|
ifndef USE_LOCAL_HEADERS
|
||||||
USE_LOCAL_HEADERS=1
|
USE_LOCAL_HEADERS=1
|
||||||
endif
|
endif
|
||||||
|
@ -796,7 +800,12 @@ ifeq ($(USE_MUMBLE),1)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_VOIP),1)
|
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
|
endif
|
||||||
|
|
||||||
ifdef DEFAULT_BASEDIR
|
ifdef DEFAULT_BASEDIR
|
||||||
|
@ -1338,7 +1347,7 @@ ifeq ($(ARCH),x86)
|
||||||
$(B)/client/snapvectora.o
|
$(B)/client/snapvectora.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_VOIP),1)
|
ifeq ($(USE_INTERNAL_SPEEX),1)
|
||||||
Q3OBJ += \
|
Q3OBJ += \
|
||||||
$(B)/client/bits.o \
|
$(B)/client/bits.o \
|
||||||
$(B)/client/buffer.o \
|
$(B)/client/buffer.o \
|
||||||
|
|
Loading…
Reference in a new issue