r1354 - trunk

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2008-06-02 08:12:00 -0400 (Mon, 02 Jun 2008)
New Revision: 1354

Modified:
   trunk/Makefile
Log:
move voip cflags definition to platform independent place


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-06-02 06:46:41 UTC (rev 1353)
+++ trunk/Makefile	2008-06-02 12:12:00 UTC (rev 1354)
@@ -241,14 +241,6 @@
     BASE_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  ifeq ($(USE_MUMBLE),1)
-    BASE_CFLAGS += -DUSE_MUMBLE
-  endif
-
-  ifeq ($(USE_VOIP),1)
-    BASE_CFLAGS += -DUSE_VOIP -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
-  endif
-
   OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
 
   ifeq ($(ARCH),x86_64)
@@ -367,14 +359,6 @@
     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
   endif
 
-  ifeq ($(USE_MUMBLE),1)
-    BASE_CFLAGS += -DUSE_MUMBLE
-  endif
-
-  ifeq ($(USE_VOIP),1)
-    BASE_CFLAGS += -DUSE_VOIP -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
-  endif
-
   BASE_CFLAGS += -D_THREAD_SAFE=1
 
   ifeq ($(USE_LOCAL_HEADERS),1)
@@ -441,14 +425,6 @@
     BASE_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  ifeq ($(USE_MUMBLE),1)
-    BASE_CFLAGS += -DUSE_MUMBLE
-  endif
-
-  ifeq ($(USE_VOIP),1)
-    BASE_CFLAGS += -DUSE_VOIP -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
-  endif
-
   OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \
     -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
     -fstrength-reduce
@@ -534,14 +510,6 @@
     BASE_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  ifeq ($(USE_MUMBLE),1)
-    BASE_CFLAGS += -DUSE_MUMBLE
-  endif
-
-  ifeq ($(USE_VOIP),1)
-    BASE_CFLAGS += -DUSE_VOIP -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
-  endif
-
   ifeq ($(ARCH),axp)
     BASE_CFLAGS += -DNO_VM_COMPILED
     RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
@@ -608,14 +576,6 @@
     BASE_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  ifeq ($(USE_MUMBLE),1)
-    BASE_CFLAGS += -DUSE_MUMBLE
-  endif
-
-  ifeq ($(USE_VOIP),1)
-    BASE_CFLAGS += -DUSE_VOIP -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
-  endif
-
   BASE_CFLAGS += -DNO_VM_COMPILED -I/usr/X11R6/include -I/usr/local/include
   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
     -march=pentium -fomit-frame-pointer -pipe -ffast-math \
@@ -827,6 +787,14 @@
   endif
 endif
 
+ifeq ($(USE_MUMBLE),1)
+  BASE_CFLAGS += -DUSE_MUMBLE
+endif
+
+ifeq ($(USE_VOIP),1)
+  BASE_CFLAGS += -DUSE_VOIP -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
+endif
+
 ifdef DEFAULT_BASEDIR
   BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
 endif