From a70247b144224d6b9e0a8c8e2cda15dd628c3ef7 Mon Sep 17 00:00:00 2001 From: tma Date: Fri, 6 Jan 2006 17:36:03 +0000 Subject: * Ogg codec support from Joerg Dietrich (disabled by default) git-svn-id: svn://svn.icculus.org/quake3/trunk@465 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/unix/Makefile | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'code/unix') diff --git a/code/unix/Makefile b/code/unix/Makefile index 87b358f..d196661 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -91,6 +91,10 @@ ifndef USE_OPENAL_DLOPEN USE_OPENAL_DLOPEN=0 endif +ifndef USE_CODEC_VORBIS +USE_CODEC_VORBIS=0 +endif + ifndef USE_LOCAL_HEADERS USE_LOCAL_HEADERS=1 endif @@ -158,6 +162,10 @@ ifeq ($(PLATFORM),linux) endif endif + ifeq ($(USE_CODEC_VORBIS),1) + BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 + endif + ifeq ($(USE_SDL),1) BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags) GL_CFLAGS = @@ -216,6 +224,10 @@ ifeq ($(PLATFORM),linux) endif endif + ifeq ($(USE_CODEC_VORBIS),1) + CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg + endif + ifeq ($(ARCH),i386) # linux32 make ... BASE_CFLAGS += -m32 @@ -247,6 +259,10 @@ ifeq ($(PLATFORM),darwin) endif endif + ifeq ($(USE_CODEC_VORBIS),1) + BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 + endif + ifeq ($(USE_SDL),1) BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 -D_THREAD_SAFE=1 -I../SDL12/include GL_CFLAGS = @@ -303,6 +319,10 @@ ifeq ($(PLATFORM),darwin) endif endif + ifeq ($(USE_CODEC_VORBIS),1) + CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg + endif + else # ifeq darwin @@ -323,6 +343,10 @@ ifeq ($(PLATFORM),mingw32) BASE_CFLAGS += -DUSE_OPENAL=1 -DUSE_OPENAL_DLOPEN=1 endif + ifeq ($(USE_CODEC_VORBIS),1) + BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 + endif + GL_CFLAGS = MINGW_CFLAGS = -DDONT_TYPEDEF_INT32 @@ -342,6 +366,10 @@ ifeq ($(PLATFORM),mingw32) LDFLAGS= -mwindows -lwsock32 -lgdi32 -lwinmm -lole32 CLIENT_LDFLAGS= + ifeq ($(USE_CODEC_VORBIS),1) + CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg + endif + ifeq ($(ARCH),x86) # build 32bit BASE_CFLAGS += -m32 @@ -714,6 +742,7 @@ Q3OBJ = \ $(B)/client/snd_main.o \ $(B)/client/snd_codec.o \ $(B)/client/snd_codec_wav.o \ + $(B)/client/snd_codec_ogg.o \ \ $(B)/client/qal.o \ $(B)/client/snd_openal.o \ @@ -933,6 +962,7 @@ $(B)/client/snd_wavelet.o : $(CDIR)/snd_wavelet.c; $(DO_CC) $(B)/client/snd_main.o : $(CDIR)/snd_main.c; $(DO_CC) $(B)/client/snd_codec.o : $(CDIR)/snd_codec.c; $(DO_CC) $(B)/client/snd_codec_wav.o : $(CDIR)/snd_codec_wav.c; $(DO_CC) +$(B)/client/snd_codec_ogg.o : $(CDIR)/snd_codec_ogg.c; $(DO_CC) $(B)/client/qal.o : $(CDIR)/qal.c; $(DO_CC) $(B)/client/snd_openal.o : $(CDIR)/snd_openal.c; $(DO_CC) -- cgit v1.2.3