svn commit: r398219 - head/games/openarena/files
Roman Bogorodskiy
novel at FreeBSD.org
Wed Sep 30 15:23:17 UTC 2015
Author: novel
Date: Wed Sep 30 15:23:16 2015
New Revision: 398219
URL: https://svnweb.freebsd.org/changeset/ports/398219
Log:
Fix build when system libspeex is installed
The fix is identical to ioquake3 fix in r398218.
Modified:
head/games/openarena/files/patch-Makefile
Modified: head/games/openarena/files/patch-Makefile
==============================================================================
--- head/games/openarena/files/patch-Makefile Wed Sep 30 15:18:06 2015 (r398218)
+++ head/games/openarena/files/patch-Makefile Wed Sep 30 15:23:16 2015 (r398219)
@@ -1,5 +1,5 @@
---- Makefile.orig 2011-12-12 23:48:49.000000000 +0100
-+++ Makefile 2012-03-07 23:00:53.000000000 +0100
+--- Makefile.orig 2011-12-13 02:48:49.000000000 +0400
++++ Makefile 2015-09-30 17:16:31.951089000 +0300
@@ -205,6 +205,8 @@
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
@@ -59,3 +59,12 @@
endif
# cross-compiling tweaks
+@@ -897,7 +902,7 @@
+ CLIENT_CFLAGS += -DUSE_VOIP
+ SERVER_CFLAGS += -DUSE_VOIP
+ ifeq ($(USE_INTERNAL_SPEEX),1)
+- CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
++ CLIENT_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(CLIENT_CFLAGS)
+ else
+ CLIENT_LIBS += -lspeex -lspeexdsp
+ endif
More information about the svn-ports-head
mailing list