diff options
| author | hairball <xhairball@gmail.com> | 2014-02-08 08:26:03 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:39 +0100 |
| commit | 62d2323b93713ec9605163c30e2663e35ce9904f (patch) | |
| tree | 005cfc8b1bd334b6dfc5330fefba8ba60bc152eb /Makefile | |
| parent | 4e2fbffaf61a5784d0e449916b63d0a9b5d493a3 (diff) | |
Add vorbis 1.3.4 build support
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 49 |
1 files changed, 47 insertions, 2 deletions
@@ -181,6 +181,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 @@ -229,7 +233,8 @@ UIDIR=$(MOUNT_DIR)/ui JPDIR=$(MOUNT_DIR)/jpeg-8c SPEEXDIR=$(MOUNT_DIR)/libspeex OGGDIR=$(MOUNT_DIR)/libogg-1.3.1 -OPUSDIR=$(MOUNT_DIR)/opus-1.0.2 +VORBISDIR=$(MOUNT_DIR)/libvorbis-1.3.4 +OPUSDIR=$(MOUNT_DIR)/opus-1.1 OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.5 ZDIR=$(MOUNT_DIR)/zlib Q3ASMDIR=$(MOUNT_DIR)/tools/asm @@ -961,8 +966,8 @@ endif ifeq ($(USE_CODEC_VORBIS),1) CLIENT_CFLAGS += -DUSE_CODEC_VORBIS - CLIENT_LIBS += -lvorbisfile -lvorbis NEED_OGG=1 + NEED_VORBIS=1 endif ifeq ($(USE_CODEC_OPUS),1) @@ -987,6 +992,15 @@ ifeq ($(NEED_OGG),1) endif endif +ifeq ($(NEED_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 @@ -1229,6 +1243,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 @@ -1874,6 +1889,33 @@ Q3OBJ += \ endif endif +ifeq ($(NEED_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 \ @@ -2212,6 +2254,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) |