diff options
| author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-05-30 17:19:31 +0000 |
|---|---|---|
| committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-05-30 17:19:31 +0000 |
| commit | 94017ca419caff91bf26841b503b5867d992ca4c (patch) | |
| tree | cc47c21ed603a9d1da62133019b2234d445bf0fc /Makefile | |
| parent | 159ae1a34675660e6d155ac77975e8ec7efc5f7b (diff) | |
| download | ioquake3-aero-94017ca419caff91bf26841b503b5867d992ca4c.tar.gz ioquake3-aero-94017ca419caff91bf26841b503b5867d992ca4c.zip | |
mumble link support
The coordinate calculation was adopted from Warsow's mumble patch.
git-svn-id: svn://svn.icculus.org/quake3/trunk@1347 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 33 |
1 files changed, 33 insertions, 0 deletions
@@ -125,6 +125,10 @@ ifndef USE_CODEC_VORBIS USE_CODEC_VORBIS=0 endif +ifndef USE_MUMBLE +USE_MUMBLE=1 +endif + ifndef USE_LOCAL_HEADERS USE_LOCAL_HEADERS=1 endif @@ -232,6 +236,10 @@ ifeq ($(PLATFORM),linux) BASE_CFLAGS += -DUSE_CODEC_VORBIS endif + ifeq ($(USE_MUMBLE),1) + BASE_CFLAGS += -DUSE_MUMBLE + endif + OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer ifeq ($(ARCH),x86_64) @@ -283,6 +291,10 @@ ifeq ($(PLATFORM),linux) CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg endif + ifeq ($(USE_MUMBLE),1) + CLIENT_LDFLAGS += -lrt + endif + ifeq ($(ARCH),i386) # linux32 make ... BASE_CFLAGS += -m32 @@ -346,6 +358,10 @@ ifeq ($(PLATFORM),darwin) CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg endif + ifeq ($(USE_MUMBLE),1) + BASE_CFLAGS += -DUSE_MUMBLE + endif + BASE_CFLAGS += -D_THREAD_SAFE=1 ifeq ($(USE_LOCAL_HEADERS),1) @@ -412,6 +428,10 @@ ifeq ($(PLATFORM),mingw32) BASE_CFLAGS += -DUSE_CODEC_VORBIS endif + ifeq ($(USE_MUMBLE),1) + BASE_CFLAGS += -DUSE_MUMBLE + endif + OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \ -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \ -fstrength-reduce @@ -497,6 +517,10 @@ ifeq ($(PLATFORM),freebsd) BASE_CFLAGS += -DUSE_CODEC_VORBIS endif + ifeq ($(USE_MUMBLE),1) + BASE_CFLAGS += -DUSE_MUMBLE + endif + ifeq ($(ARCH),axp) BASE_CFLAGS += -DNO_VM_COMPILED RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ @@ -564,6 +588,10 @@ ifeq ($(PLATFORM),openbsd) BASE_CFLAGS += -DUSE_CODEC_VORBIS endif + ifeq ($(USE_MUMBLE),1) + BASE_CFLAGS += -DUSE_MUMBLE + 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 \ @@ -1339,6 +1367,11 @@ else $(B)/client/sys_unix.o endif +ifeq ($(USE_MUMBLE),1) + Q3OBJ += \ + $(B)/client/libmumblelink.o +endif + Q3POBJ += \ $(B)/client/sdl_glimp.o |