From e2baf17ae348057ee5b96be1a9e224feca5f9238 Mon Sep 17 00:00:00 2001
From: ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Thu, 5 Jun 2008 08:55:08 +0000
Subject: allow linking against an external speex library

git-svn-id: svn://svn.icculus.org/quake3/trunk@1369 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 Makefile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2b756ea..64c68a1 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
-- 
cgit v1.2.3