|
Lines 1-5
Link Here
|
| 1 |
--- Makefile.orig 2009-04-22 20:54:48.000000000 +0200 |
1 |
--- Makefile.orig 2009-04-22 22:54:48.000000000 +0400 |
| 2 |
+++ Makefile 2011-11-04 20:42:56.000000000 +0100 |
2 |
+++ Makefile 2015-09-28 20:24:27.956819000 +0300 |
| 3 |
@@ -187,6 +187,8 @@ |
3 |
@@ -187,6 +187,8 @@ |
| 4 |
# FIXME: introduce CLIENT_CFLAGS |
4 |
# FIXME: introduce CLIENT_CFLAGS |
| 5 |
SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') |
5 |
SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') |
|
Lines 131-136
Link Here
|
| 131 |
else # ifeq freebsd |
131 |
else # ifeq freebsd |
| 132 |
|
132 |
|
| 133 |
############################################################################# |
133 |
############################################################################# |
|
|
134 |
@@ -831,7 +846,7 @@ |
| 135 |
ifeq ($(USE_VOIP),1) |
| 136 |
BASE_CFLAGS += -DUSE_VOIP |
| 137 |
ifeq ($(USE_INTERNAL_SPEEX),1) |
| 138 |
- BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include |
| 139 |
+ BASE_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(BASE_CFLAGS) |
| 140 |
else |
| 141 |
CLIENT_LIBS += -lspeex |
| 142 |
endif |
| 134 |
@@ -1442,6 +1457,9 @@ |
143 |
@@ -1442,6 +1457,9 @@ |
| 135 |
ifeq ($(ARCH),x86_64) |
144 |
ifeq ($(ARCH),x86_64) |
| 136 |
Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o |
145 |
Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o |