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

Enable Ogg Vorbis support by default

Browse source 
libvorbis is included in-tree so this doesn't require additional
dependencies.
This commit is contained in:
Zack Middleton 2017-09-23 19:55:49 -05:00
parent 45de6be4c2
commit 414f3c5e3e
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -14,8 +14,8 @@ env:
- CC=gcc - CC=gcc
- CC=clang - CC=clang
# extra libs # extra libs
- CC=gcc USE_CODEC_VORBIS=1 USE_FREETYPE=1 - CC=gcc USE_FREETYPE=1
- CC=clang USE_CODEC_VORBIS=1 USE_FREETYPE=1 - CC=clang USE_FREETYPE=1
# cross-compile using mingw # cross-compile using mingw
# dlopen curl to workaround link error because mingw-w64 in trusty is missing strtok_r required by libcurl.a # dlopen curl to workaround link error because mingw-w64 in trusty is missing strtok_r required by libcurl.a
- CC= PLATFORM="mingw32" ARCH="x86" USE_CURL_DLOPEN=1 - CC= PLATFORM="mingw32" ARCH="x86" USE_CURL_DLOPEN=1

2
Makefile
View file

@ -176,7 +176,7 @@ ifndef USE_CURL_DLOPEN
endif endif
ifndef USE_CODEC_VORBIS ifndef USE_CODEC_VORBIS
USE_CODEC_VORBIS=0 USE_CODEC_VORBIS=1
endif endif
ifndef USE_CODEC_OPUS ifndef USE_CODEC_OPUS

1
jenkins-ci-build.sh
View file

@ -8,7 +8,6 @@ cd ${MASTER_DIR}
if [ "${OPTIONS}" == "all_options" ]; if [ "${OPTIONS}" == "all_options" ];
then then
export USE_CODEC_VORBIS=1
export USE_FREETYPE=1 export USE_FREETYPE=1
fi fi