diff options
| author | novel <novel@FreeBSD.org> | 2015-09-30 23:18:06 +0800 |
|---|---|---|
| committer | novel <novel@FreeBSD.org> | 2015-09-30 23:18:06 +0800 |
| commit | 6538efa933d7737a009030c5afd143822b67e434 (patch) | |
| tree | 3650436b70e14fea7c4fe1c61b86a8339df5c7e3 /games | |
| parent | 6446b39b09f5e16bfb69756cddd71fa812c570e0 (diff) | |
| download | freebsd-ports-gnome-6538efa933d7737a009030c5afd143822b67e434.tar.gz freebsd-ports-gnome-6538efa933d7737a009030c5afd143822b67e434.tar.zst freebsd-ports-gnome-6538efa933d7737a009030c5afd143822b67e434.zip | |
Fix build when system libspeex is installed
The build system uses incorrect include order and it picks system
libspeex headers instead of bundled one so build fails because of
the interface difference.
Fix that by forcing including bundled libspeex. This also fixes
build of iourbanterror build.
PR: 201926
Diffstat (limited to 'games')
| -rw-r--r-- | games/ioquake3/files/patch-Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/games/ioquake3/files/patch-Makefile b/games/ioquake3/files/patch-Makefile index ca1190284c67..7b1d83f32a4e 100644 --- a/games/ioquake3/files/patch-Makefile +++ b/games/ioquake3/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2009-04-22 20:54:48.000000000 +0200 -+++ Makefile 2011-11-04 20:42:56.000000000 +0100 +--- Makefile.orig 2009-04-22 22:54:48.000000000 +0400 ++++ Makefile 2015-09-28 20:24:27.956819000 +0300 @@ -187,6 +187,8 @@ # FIXME: introduce CLIENT_CFLAGS SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') @@ -131,6 +131,15 @@ else # ifeq freebsd ############################################################################# +@@ -831,7 +846,7 @@ + ifeq ($(USE_VOIP),1) + BASE_CFLAGS += -DUSE_VOIP + ifeq ($(USE_INTERNAL_SPEEX),1) +- BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include ++ BASE_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(BASE_CFLAGS) + else + CLIENT_LIBS += -lspeex + endif @@ -1442,6 +1457,9 @@ ifeq ($(ARCH),x86_64) Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o |