kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build when system libspeex is installed

Browse source 
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
This commit is contained in:
Roman Bogorodskiy 2015-09-30 15:18:06 +00:00
parent e87e8d2588
commit 789fea148c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=398218
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
games/ioquake3/files/patch-Makefile
View file

@ -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