Merge branch 'master' of github.com:wesnoth/wesnoth

This commit is contained in:
Ignacio R. Morelle 2014-06-29 20:50:34 -04:00
commit ab8081041d

View file

@ -20,10 +20,10 @@ before_install:
- if [ "$CXX" = "g++" ]; then time sudo apt-get update -qq; fi
- if [ "$CXX" = "g++" ]; then time sudo apt-get install g++-4.8; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
- if [ "$CXX" = "clang++" ]; then time sudo apt-get install moreutils; fi
install:
- time sudo apt-get update -qq
- time sudo apt-get install -qq 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-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
- if [ "$CXX" = "clang++" ]; then time sudo apt-get install -qq moreutils; fi
script:
- if [ "$CXX" = "clang++" ]; then time ./utils/travis/check_utf8.sh; fi
- scons cxxtool=$CXX --debug=time strict=$STRICT_COMPILATION $TARGETS