Updated travis files. XMP is now disabled on Travis since Travis uses Ubuntu 12.04. Also clang is currently disabled and will be so until: 92b74e58cc is included

This commit is contained in:
sago007
2015-09-06 13:43:23 +02:00
parent 04870d3a20
commit de27a72f00
2 changed files with 5 additions and 4 deletions

View File

@@ -1,7 +1,6 @@
language: c language: c
compiler: compiler:
- gcc - gcc
- clang
# These fail because ioquake3 is missing vorbis # These fail because ioquake3 is missing vorbis
# Re-enable after they add vorbis or OA imports it # Re-enable after they add vorbis or OA imports it
# - i686-w64-mingw32-gcc # - i686-w64-mingw32-gcc
@@ -12,7 +11,7 @@ script: ./travis-ci-build.sh
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get remove -qq -y mingw32 - sudo apt-get remove -qq -y mingw32
- sudo apt-get install -q -y libgl1-mesa-dev libsdl1.2-dev libvorbis-dev libfreetype6-dev mingw-w64 libxmp-dev - sudo apt-get install -q -y libgl1-mesa-dev libsdl1.2-dev libvorbis-dev libfreetype6-dev mingw-w64
notifications: notifications:
email: false email: false

View File

@@ -2,6 +2,8 @@
failed=0; failed=0;
# Travis is currently running 12.04 and do not support XMP
# check if testing mingw # check if testing mingw
if [ "$CC" = "i686-w64-mingw32-gcc" ]; then if [ "$CC" = "i686-w64-mingw32-gcc" ]; then
export PLATFORM=mingw32 export PLATFORM=mingw32
@@ -18,11 +20,11 @@ else
fi fi
# Default Build # Default Build
(make clean release) || failed=1; (make clean release USE_CODEC_XMP=0) || failed=1;
# Test additional options # Test additional options
if [ $haveExternalLibs -eq 1 ]; then if [ $haveExternalLibs -eq 1 ]; then
(make clean release USE_CODEC_VORBIS=1 USE_FREETYPE=1) || failed=1; (make clean release USE_CODEC_XMP=0 USE_CODEC_VORBIS=1 USE_FREETYPE=1) || failed=1;
fi fi
if [ $failed -eq 1 ]; then if [ $failed -eq 1 ]; then