diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-25 10:18:08 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-25 10:18:08 +0100 |
commit | 0d5a9358fc7f45d0b7636151f305b021f343d187 (patch) | |
tree | 920db395376d2902a9abd270cd641055236173bc /.travis.yml | |
parent | 5f1c202a6b35a0b5c102d9ab6b8bf1e730ce5a03 (diff) | |
download | colobot-0d5a9358fc7f45d0b7636151f305b021f343d187.tar.gz colobot-0d5a9358fc7f45d0b7636151f305b021f343d187.tar.bz2 colobot-0d5a9358fc7f45d0b7636151f305b021f343d187.zip |
Revert "Travis change from #148"
This reverts commit 5f1c202a6b35a0b5c102d9ab6b8bf1e730ce5a03.
Reverting change because we still need to check GCC 4.6 compatibility.
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 2750af2..af27ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,7 @@ script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all before_install: - git submodule update --init --recursive - sudo add-apt-repository ppa:mapnik/boost -y - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -qq - - 'if [ "$CXX" = "g++" ]; then sudo apt-get -qq install g++ g++-4.7 && export CXX=g++-4.7 && export CC=gcc-4.7; fi' - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin libsndfile-dev notifications: email: false |