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

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

Browse source
This commit is contained in:
Zack Middleton 2014-02-07 22:11:31 -06:00
commit 166f5ab90c
12 changed files with 2841 additions and 1013 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -242,7 +242,7 @@ JPDIR=$(MOUNT_DIR)/jpeg-8c
SPEEXDIR=$(MOUNT_DIR)/libspeex
OGGDIR=$(MOUNT_DIR)/libogg-1.3.1
OPUSDIR=$(MOUNT_DIR)/opus-1.0.2
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.2
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.5
ZDIR=$(MOUNT_DIR)/zlib
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
@ -1955,7 +1955,8 @@ Q3OBJ += \
$(B)/client/info.o \
$(B)/client/internal.o \
$(B)/client/opusfile.o \
$(B)/client/stream.o
$(B)/client/stream.o \
$(B)/client/wincerts.o
endif
endif