From 10afaeef337e0d19b37cb7dbe3fccee48bf18a43 Mon Sep 17 00:00:00 2001 From: icculus Date: Sun, 1 Jun 2008 07:51:23 +0000 Subject: Initial patch for in-game VoIP support! git-svn-id: svn://svn.icculus.org/quake3/trunk@1348 edf5b092-35ff-0310-97b2-ce42778d08ea --- Makefile | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fa7928b..3b90ba0 100644 --- a/Makefile +++ b/Makefile @@ -129,6 +129,10 @@ ifndef USE_MUMBLE USE_MUMBLE=1 endif +ifndef USE_VOIP +USE_VOIP=1 +endif + ifndef USE_LOCAL_HEADERS USE_LOCAL_HEADERS=1 endif @@ -240,6 +244,10 @@ ifeq ($(PLATFORM),linux) BASE_CFLAGS += -DUSE_MUMBLE endif + ifeq ($(USE_VOIP),1) + BASE_CFLAGS += -DUSE_VOIP + endif + OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer ifeq ($(ARCH),x86_64) @@ -295,6 +303,10 @@ ifeq ($(PLATFORM),linux) CLIENT_LDFLAGS += -lrt endif + ifeq ($(USE_VOIP),1) + CLIENT_LDFLAGS += -lspeex + endif + ifeq ($(ARCH),i386) # linux32 make ... BASE_CFLAGS += -m32 @@ -362,6 +374,11 @@ ifeq ($(PLATFORM),darwin) BASE_CFLAGS += -DUSE_MUMBLE endif + ifeq ($(USE_VOIP),1) + BASE_CFLAGS += -DUSE_VOIP + CLIENT_LDFLAGS += -lspeex + endif + BASE_CFLAGS += -D_THREAD_SAFE=1 ifeq ($(USE_LOCAL_HEADERS),1) @@ -432,6 +449,10 @@ ifeq ($(PLATFORM),mingw32) BASE_CFLAGS += -DUSE_MUMBLE endif + ifeq ($(USE_VOIP),1) + BASE_CFLAGS += -DUSE_VOIP + endif + OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \ -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \ -fstrength-reduce @@ -464,6 +485,10 @@ ifeq ($(PLATFORM),mingw32) CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg endif + ifeq ($(USE_VOIP),1) + CLIENT_LDFLAGS += -lspeex + endif + ifeq ($(ARCH),x86) # build 32bit BASE_CFLAGS += -m32 @@ -521,6 +546,10 @@ ifeq ($(PLATFORM),freebsd) BASE_CFLAGS += -DUSE_MUMBLE endif + ifeq ($(USE_VOIP),1) + BASE_CFLAGS += -DUSE_VOIP + endif + ifeq ($(ARCH),axp) BASE_CFLAGS += -DNO_VM_COMPILED RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ @@ -561,6 +590,10 @@ ifeq ($(PLATFORM),freebsd) CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg endif + ifeq ($(USE_VOIP),1) + CLIENT_LDFLAGS += -lspeex + endif + else # ifeq freebsd @@ -592,6 +625,10 @@ ifeq ($(PLATFORM),openbsd) BASE_CFLAGS += -DUSE_MUMBLE endif + ifeq ($(USE_VOIP),1) + BASE_CFLAGS += -DUSE_VOIP + 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 \ @@ -622,6 +659,10 @@ ifeq ($(PLATFORM),openbsd) CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg endif + ifeq ($(USE_VOIP),1) + CLIENT_LDFLAGS += -lspeex + endif + else # ifeq openbsd -- cgit v1.2.3