r1369 - trunk

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2008-06-05 04:55:08 -0400 (Thu, 05 Jun 2008)
New Revision: 1369

Modified:
   trunk/Makefile
Log:
allow linking against an external speex library


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-06-05 08:42:37 UTC (rev 1368)
+++ trunk/Makefile	2008-06-05 08:55:08 UTC (rev 1369)
@@ -133,6 +133,10 @@
 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 @@
 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 @@
     $(B)/client/snapvectora.o
 endif
 
-ifeq ($(USE_VOIP),1)
+ifeq ($(USE_INTERNAL_SPEEX),1)
 Q3OBJ += \
   $(B)/client/bits.o \
   $(B)/client/buffer.o \