teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-29 23:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

move voip cflags definition to platform independent place

Browse source
This commit is contained in:
Ludwig Nussel 2008-06-02 12:12:00 +00:00
parent d43ecc9909
commit b8d3888f31
1 changed files with 8 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Makefile
View file

@ -241,14 +241,6 @@ ifeq ($(PLATFORM),linux)
BASE_CFLAGS += -DUSE_CODEC_VORBIS BASE_CFLAGS += -DUSE_CODEC_VORBIS
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
OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
@ -367,14 +359,6 @@ ifeq ($(PLATFORM),darwin)
CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
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
BASE_CFLAGS += -D_THREAD_SAFE=1 BASE_CFLAGS += -D_THREAD_SAFE=1
ifeq ($(USE_LOCAL_HEADERS),1) ifeq ($(USE_LOCAL_HEADERS),1)
@ -441,14 +425,6 @@ ifeq ($(PLATFORM),mingw32)
BASE_CFLAGS += -DUSE_CODEC_VORBIS BASE_CFLAGS += -DUSE_CODEC_VORBIS
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
OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \ OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \
-falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \ -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
-fstrength-reduce -fstrength-reduce
@ -534,14 +510,6 @@ ifeq ($(PLATFORM),freebsd)
BASE_CFLAGS += -DUSE_CODEC_VORBIS BASE_CFLAGS += -DUSE_CODEC_VORBIS
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
ifeq ($(ARCH),axp) ifeq ($(ARCH),axp)
BASE_CFLAGS += -DNO_VM_COMPILED BASE_CFLAGS += -DNO_VM_COMPILED
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
@ -608,14 +576,6 @@ ifeq ($(PLATFORM),openbsd)
BASE_CFLAGS += -DUSE_CODEC_VORBIS BASE_CFLAGS += -DUSE_CODEC_VORBIS
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
BASE_CFLAGS += -DNO_VM_COMPILED -I/usr/X11R6/include -I/usr/local/include BASE_CFLAGS += -DNO_VM_COMPILED -I/usr/X11R6/include -I/usr/local/include
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
-march=pentium -fomit-frame-pointer -pipe -ffast-math \ -march=pentium -fomit-frame-pointer -pipe -ffast-math \
@ -827,6 +787,14 @@ ifneq ($(BUILD_GAME_QVM),0)
endif endif
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 ifdef DEFAULT_BASEDIR
BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\" BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
endif endif