summaryrefslogtreecommitdiff
blob: 9c49b9458a7d6d16be2a16888b0ec17690e465ae (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
--- openarena-engine-0.8.1/Makefile	2008-08-09 22:22:37.000000000 +0200
+++ openarena-engine-0.8.1/Makefile.new	2009-01-07 19:33:31.000000000 +0100
@@ -67,6 +67,10 @@
 
 ifndef ARCH
 ARCH=$(COMPILE_ARCH)
+else
+  ifeq ($(ARCH),amd64)
+    ARCH=x86_64
+  endif
 endif
 export ARCH
 
@@ -231,8 +231,7 @@
   endif
   endif
 
-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-    -pipe -DUSE_ICON $(shell sdl-config --cflags)
+  BASE_CFLAGS = %CFLAGS% -DUSE_ICON $(shell sdl-config --cflags)
 
   ifeq ($(USE_OPENAL),1)
     BASE_CFLAGS += -DUSE_OPENAL
@@ -323,7 +322,7 @@
   endif
 
   DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
-  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
+  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG
 
 else # ifeq Linux
 
@@ -821,7 +821,7 @@
   ifeq ($(USE_INTERNAL_SPEEX),1)
     BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
   else
-    CLIENT_LDFLAGS += -lspeex
+    CLIENT_LDFLAGS += -lspeex -lspeexdsp
   endif
 endif