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

Merge branch 'features/upgrade-opus-1.1' of https://github.com/xhairball/ioq3 into opus_update

Browse source 
Conflicts:
	Makefile
This commit is contained in:
Zack Middleton 2014-02-07 22:12:59 -06:00
commit d0b1fb4fed
244 changed files with 14640 additions and 7096 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -241,7 +241,7 @@ Q3UIDIR=$(MOUNT_DIR)/q3_ui
JPDIR=$(MOUNT_DIR)/jpeg-8c
SPEEXDIR=$(MOUNT_DIR)/libspeex
OGGDIR=$(MOUNT_DIR)/libogg-1.3.1
OPUSDIR=$(MOUNT_DIR)/opus-1.0.2
OPUSDIR=$(MOUNT_DIR)/opus-1.1
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.5
ZDIR=$(MOUNT_DIR)/zlib
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
@ -1819,10 +1819,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 \
@ -1837,6 +1842,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 \