Revert "Try to fix travis-ci"

This reverts commit 8fa0cdb543.
This commit is contained in:
vlj 2014-08-12 16:38:04 +02:00
parent 36b791c515
commit a4955325fd

View File

@ -14,13 +14,13 @@ before_install:
# Update repos
- sudo apt-get update -qq
# Install dependencies
- sudo apt-get install cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
- sudo apt-get install build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
# Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014,
# so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link)
- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted"
- sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
- sudo apt-get update -qq
- sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev build-essential
- sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev
script:
# First a debug build:
- mkdir build-debug