diff options
| author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-06-05 08:55:08 +0000 |
|---|---|---|
| committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-06-05 08:55:08 +0000 |
| commit | e2baf17ae348057ee5b96be1a9e224feca5f9238 (patch) | |
| tree | 8e9e23aa85994707098fe49793557153d538686c | |
| parent | 9672cc07a1f52176f7c39f6a570f182b7b835e04 (diff) | |
| download | ioquake3-aero-e2baf17ae348057ee5b96be1a9e224feca5f9238.tar.gz ioquake3-aero-e2baf17ae348057ee5b96be1a9e224feca5f9238.zip | |
allow linking against an external speex library
git-svn-id: svn://svn.icculus.org/quake3/trunk@1369 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -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 \ |