diff options
| -rw-r--r-- | Makefile | 48 |
1 files changed, 8 insertions, 40 deletions
@@ -241,14 +241,6 @@ ifeq ($(PLATFORM),linux) 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 @@ ifeq ($(PLATFORM),darwin) 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 @@ ifeq ($(PLATFORM),mingw32) 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 @@ ifeq ($(PLATFORM),freebsd) 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 @@ ifeq ($(PLATFORM),openbsd) 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 @@ ifneq ($(BUILD_GAME_QVM),0) 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 |