Attachment 161502 Details for Bug 201926 – Fix include order for bundled libspee

[patch] Fix include order for bundled libspee

ioquake3_speex_includes.diff (text/plain), 1.08 KB, created by Roman Bogorodskiy on 2015-09-28 17:31:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Bogorodskiy

Created: 2015-09-28 17:31:55 UTC

Size: 1.08 KB

patch

obsolete

>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 398125)
>+++ files/patch-Makefile	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 201926: 159309 | 161502