summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorhairball <xhairball@gmail.com>2014-02-08 03:21:02 +0000
committerTim Angus <tim@ngus.net>2014-06-17 17:43:38 +0100
commit35064811c0ac104acddd7777e00bfd9e054c2db6 (patch)
tree4063389141542093ecc3de47e3999ed099520621 /Makefile
parent1778f3fb8cabe7400011c84331018b0ebf6a44b1 (diff)
Upgrade opus 1.0.2 -> 1.1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5d18000e..453b621f 100644
--- a/Makefile
+++ b/Makefile
@@ -229,7 +229,7 @@ UIDIR=$(MOUNT_DIR)/ui
JPDIR=$(MOUNT_DIR)/jpeg-8c
SPEEXDIR=$(MOUNT_DIR)/libspeex
OGGDIR=$(MOUNT_DIR)/libogg-1.3.0
-OPUSDIR=$(MOUNT_DIR)/opus-1.0.2
+OPUSDIR=$(MOUNT_DIR)/opus-1.1
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.2
ZDIR=$(MOUNT_DIR)/zlib
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
@@ -1714,10 +1714,15 @@ endif
ifeq ($(USE_CODEC_OPUS),1)
ifeq ($(USE_INTERNAL_OPUS),1)
Q3OBJ += \
+ $(B)/client/opus/analysis.o \
+ $(B)/client/opus/mlp.o \
+ $(B)/client/opus/mlp_data.o \
$(B)/client/opus/opus.o \
$(B)/client/opus/opus_decoder.o \
$(B)/client/opus/opus_encoder.o \
$(B)/client/opus/opus_multistream.o \
+ $(B)/client/opus/opus_multistream_encoder.o \
+ $(B)/client/opus/opus_multistream_decoder.o \
$(B)/client/opus/repacketizer.o \
\
$(B)/client/opus/bands.o \
@@ -1732,6 +1737,8 @@ Q3OBJ += \
$(B)/client/opus/mdct.o \
$(B)/client/opus/modes.o \
$(B)/client/opus/pitch.o \
+ $(B)/client/opus/celt_encoder.o \
+ $(B)/client/opus/celt_decoder.o \
$(B)/client/opus/celt_lpc.o \
$(B)/client/opus/quant_bands.o \
$(B)/client/opus/rate.o \