diff --git a/.travis.yml b/.travis.yml index 7254949d6d..26849de341 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,19 +8,20 @@ compiler: - clang - gcc -before_install: +install: - if [ `uname` = "Linux" ]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sudo apt-get update; - sudo apt-get install -y libvorbis-dev libtheora-dev libwebp-dev libphysfs-dev libopusfile-dev libdumb1-dev libflac-dev libpulse-dev libgtk2.0-dev pandoc libcurl4-nss-dev libenet-dev pulseaudio libasound2-dev libopenal-dev; + sudo apt-get install -y libvorbis-dev libtheora-dev libwebp-dev libphysfs-dev libopusfile-dev libdumb1-dev libflac-dev libpulse-dev libgtk2.0-dev pandoc libcurl4-nss-dev libenet-dev pulseaudio libasound2-dev libopenal-dev libsdl2-dev; elif [ `uname` = "Darwin" ]; then - brew update && brew install opusfile libvorbis webp freetype flac physfs dumb theora enet; + brew update && brew install opusfile libvorbis webp freetype flac physfs dumb theora enet sdl2; fi env: - - WANT_SHADERS_GL=on - - WANT_SHADERS_GL=off + - WANT_SHADERS_GL=on SDL=on + - WANT_SHADERS_GL=on SDL=off + - WANT_SHADERS_GL=off SDL=off before_script: - mkdir build @@ -29,7 +30,7 @@ before_script: script: - | if [ `uname` = "Linux" ]; then - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWANT_SHADERS_GL=$WANT_SHADERS_GL -DWANT_CURL_EXAMPLE=on + cmake .. -DCMAKE_BUILD_TYPE=Debug -DWANT_SHADERS_GL=$WANT_SHADERS_GL -DWANT_SDL=$WANT_SDL -DWANT_CURL_EXAMPLE=on make . ../tests/grab_bitmap_suites.sh find ../tests -name '*.ini' | grep -v 'compressed' | xargs tests/test_driver | tee /tmp/test_out @@ -40,7 +41,7 @@ script: pulseaudio -D ./install_test elif [ `uname` = "Darwin" ]; then - cmake .. -DWANT_SHADERS_GL=$WANT_SHADERS_GL -G Xcode + cmake .. -DWANT_SHADERS_GL=$WANT_SHADERS_GL -DWANT_SDL=$WANT_SDL -G Xcode xcodebuild fi