fixup travis

This commit is contained in:
Chris Beck 2014-10-26 16:19:32 -04:00
parent f33f8bb3ed
commit bcb89aa0c7

View file

@ -5,7 +5,8 @@ compiler:
before_install:
- sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ saucy main universe"
- sudo apt-get update -qq
- sudo apt-get install -qq libsdl-mixer1.2-dev
- sudo apt-get install -qq libsdl-mixer1.2-dev libboost-locale-dev
- sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl-image1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
- sudo add-apt-repository -y --remove "deb http://archive.ubuntu.com/ubuntu/ saucy main universe"
- if [ "$CXX" = "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test ; fi
- sudo apt-get update -qq
@ -13,7 +14,6 @@ before_install:
- if [ "$CXX" = "g++" ]; then sudo add-apt-repository -y --remove ppa:ubuntu-toolchain-r/test ; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
install:
- sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-locale-dev libboost-test-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl-image1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
script: scons cxxtool=$CXX strict=True extra_flags_release="-O0" wesnoth wesnothd campaignd test
after_script:
- "export DISPLAY=:99.0"