File 0001-instead-of-shipping-a-copy-of-speex-make-i... of Package ioquake3-win32

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-instead-of-shipping-a-copy-of-speex-make-it-easier-to.diff of Package ioquake3-win32

From ab61bbf485f4577e18245a6a8d0fed33ea0e6e57 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Mon, 2 Jun 2008 09:43:10 +0200
Subject: [PATCH] instead of shipping a copy of speex make it easier to use a vanilla
 upstream tarball.

---
 Makefile |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index fe79813..55cdc6c 100644
--- a/Makefile
+++ b/Makefile
@@ -133,6 +133,15 @@ ifndef USE_VOIP
 USE_VOIP=1
 endif
 
+# extract speex tarball in code/libs and rename/symlink top level
+# directory to 'speex'. e.g:
+# tar -C code/libs -xjf speex-1.2beta3.tar.bz2
+# ln -s speex-1.2beta3 code/libs/speex
+# (cd code/libs/speex && ./configure) # FIXME: put speex_config_types.h somewhere
+ifndef USE_INTREE_SPEEX
+USE_INTREE_SPEEX=0
+endif
+
 ifndef USE_LOCAL_HEADERS
 USE_LOCAL_HEADERS=1
 endif
@@ -155,7 +164,7 @@ NDIR=$(MOUNT_DIR)/null
 UIDIR=$(MOUNT_DIR)/ui
 Q3UIDIR=$(MOUNT_DIR)/q3_ui
 JPDIR=$(MOUNT_DIR)/jpeg-6
-SPEEXDIR=$(MOUNT_DIR)/libspeex
+SPEEXDIR=$(MOUNT_DIR)/libs/speex
 Q3ASMDIR=$(MOUNT_DIR)/tools/asm
 LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
 Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp
@@ -792,7 +801,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_INTREE_SPEEX),1)
+    BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
+  else
+    CLIENT_LDFLAGS += -lspeex
+  endif
 endif
 
 ifdef DEFAULT_BASEDIR
@@ -1334,7 +1348,7 @@ ifeq ($(ARCH),x86)
     $(B)/client/snapvectora.o
 endif
 
-ifeq ($(USE_VOIP),1)
+ifeq ($(USE_INTREE_SPEEX),1)
 Q3OBJ += \
   $(B)/client/bits.o \
   $(B)/client/buffer.o \
@@ -1857,7 +1871,7 @@ $(B)/client/%.o: $(BLIBDIR)/%.c
 $(B)/client/%.o: $(JPDIR)/%.c
 	$(DO_CC)
 
-$(B)/client/%.o: $(SPEEXDIR)/%.c
+$(B)/client/%.o: $(SPEEXDIR)/libspeex/%.c
 	$(DO_CC)
 
 $(B)/client/%.o: $(RDIR)/%.c
-- 
1.5.4.5

Places

File 0001-instead-of-shipping-a-copy-of-speex-make-it-easier-to.diff of Package ioquake3-win32

Places