reorder includes so that we get the internal libspeex first.

fix 'hidden dependency' error after the recent update to libspeex
(headers have changed enough to be incompatible)
This commit is contained in:
espie 2017-08-18 20:39:06 +00:00
parent e318140f31
commit c3adf94d7f

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile,v 1.6 2014/07/11 08:14:16 ajacoutot Exp $
--- Makefile.orig Mon Dec 12 23:48:49 2011
+++ Makefile Wed Jan 29 02:12:09 2014
$OpenBSD: patch-Makefile,v 1.7 2017/08/18 20:39:06 espie Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -164,13 +164,14 @@ endif
#############################################################################
@ -78,6 +79,15 @@ $OpenBSD: patch-Makefile,v 1.6 2014/07/11 08:14:16 ajacoutot Exp $
ifneq ($(BUILD_CLIENT_SMP),0)
TARGETS += $(B)/openarena-smp$(FULLBINEXT)
endif
@@ -897,7 +898,7 @@ ifeq ($(USE_VOIP),1)
CLIENT_CFLAGS += -DUSE_VOIP
SERVER_CFLAGS += -DUSE_VOIP
ifeq ($(USE_INTERNAL_SPEEX),1)
- CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
+ CLIENT_CFLAGS := -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include $(CLIENT_CFLAGS)
else
CLIENT_LIBS += -lspeex -lspeexdsp
endif
@@ -1471,8 +1472,9 @@ Q3OBJ = \
\
$(B)/client/sdl_gamma.o \