okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #44 from xhairball/features/add-vorbis-1.3.4

Browse source 
Add vorbis 1.3.4 support
This commit is contained in:
Tim Angus 2014-03-24 14:15:11 +00:00
commit 1cbb5e9771
68 changed files with 60575 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Makefile
View file

@ -195,6 +195,10 @@ ifndef USE_INTERNAL_OGG
USE_INTERNAL_OGG=1
endif
ifndef USE_INTERNAL_VORBIS
USE_INTERNAL_VORBIS=1
endif
ifndef USE_INTERNAL_OPUS
USE_INTERNAL_OPUS=1
endif
@ -241,6 +245,7 @@ Q3UIDIR=$(MOUNT_DIR)/q3_ui
JPDIR=$(MOUNT_DIR)/jpeg-8c
SPEEXDIR=$(MOUNT_DIR)/libspeex
OGGDIR=$(MOUNT_DIR)/libogg-1.3.1
VORBISDIR=$(MOUNT_DIR)/libvorbis-1.3.4
OPUSDIR=$(MOUNT_DIR)/opus-1.1
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.5
ZDIR=$(MOUNT_DIR)/zlib
@ -989,7 +994,6 @@ endif
ifeq ($(USE_CODEC_VORBIS),1)
CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
CLIENT_LIBS += -lvorbisfile -lvorbis
NEED_OGG=1
endif
@ -1015,6 +1019,15 @@ ifeq ($(NEED_OGG),1)
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
ifeq ($(USE_INTERNAL_VORBIS),1)
CLIENT_CFLAGS += -I$(VORBISDIR)/include -I$(VORBISDIR)/lib
else
CLIENT_LIBS += -lvorbisfile -lvorbis
endif
endif
ifeq ($(USE_RENDERER_DLOPEN),1)
CLIENT_CFLAGS += -DUSE_RENDERER_DLOPEN
endif
@ -1280,6 +1293,7 @@ makedirs:
@if [ ! -d $(B) ];then $(MKDIR) $(B);fi
@if [ ! -d $(B)/client ];then $(MKDIR) $(B)/client;fi
@if [ ! -d $(B)/client/opus ];then $(MKDIR) $(B)/client/opus;fi
@if [ ! -d $(B)/client/vorbis ];then $(MKDIR) $(B)/client/vorbis;fi
@if [ ! -d $(B)/renderergl1 ];then $(MKDIR) $(B)/renderergl1;fi
@if [ ! -d $(B)/renderergl2 ];then $(MKDIR) $(B)/renderergl2;fi
@if [ ! -d $(B)/renderergl2/glsl ];then $(MKDIR) $(B)/renderergl2/glsl;fi
@ -1979,6 +1993,33 @@ Q3OBJ += \
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
ifeq ($(USE_INTERNAL_VORBIS),1)
Q3OBJ += \
$(B)/client/vorbis/analysis.o \
$(B)/client/vorbis/bitrate.o \
$(B)/client/vorbis/block.o \
$(B)/client/vorbis/codebook.o \
$(B)/client/vorbis/envelope.o \
$(B)/client/vorbis/floor0.o \
$(B)/client/vorbis/floor1.o \
$(B)/client/vorbis/info.o \
$(B)/client/vorbis/lookup.o \
$(B)/client/vorbis/lpc.o \
$(B)/client/vorbis/lsp.o \
$(B)/client/vorbis/mapping0.o \
$(B)/client/vorbis/mdct.o \
$(B)/client/vorbis/psy.o \
$(B)/client/vorbis/registry.o \
$(B)/client/vorbis/res0.o \
$(B)/client/vorbis/smallft.o \
$(B)/client/vorbis/sharedbook.o \
$(B)/client/vorbis/synthesis.o \
$(B)/client/vorbis/vorbisfile.o \
$(B)/client/vorbis/window.o
endif
endif
ifeq ($(USE_INTERNAL_ZLIB),1)
Q3OBJ += \
$(B)/client/adler32.o \
@ -2506,6 +2547,9 @@ $(B)/client/%.o: $(SPEEXDIR)/%.c
$(B)/client/%.o: $(OGGDIR)/src/%.c
$(DO_CC)
$(B)/client/vorbis/%.o: $(VORBISDIR)/lib/%.c
$(DO_CC)
$(B)/client/opus/%.o: $(OPUSDIR)/src/%.c
$(DO_CC)