diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-07-11 21:02:29 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-07-11 21:02:29 -0400 |
| commit | d5f5666f460cfbfc1f4b20c6b60e5636c97050bb (patch) | |
| tree | a0c002a8a35ce29321699dc5c40a972bcb9a5ace /.travis-deps.sh | |
| parent | 8c70b1b8b525de5ff491af934737251bb7ad8bab (diff) | |
| parent | 6fc605a19624106d94b6f871d1f5cdbaa73e7df3 (diff) | |
Merge pull request #915 from citra-emu/travis-container
Travis: Remove use of sudo to enable use container-based builds
Diffstat (limited to '.travis-deps.sh')
| -rwxr-xr-x | .travis-deps.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh index b9561bb6..d1097341 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -5,24 +5,24 @@ set -x #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get -qq update - sudo apt-get -qq install g++-4.9 xorg-dev libglu1-mesa-dev libxcursor-dev - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90 + export CC=gcc-4.9 + export CXX=g++-4.9 + mkdir -p $HOME/.local + + curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \ + | tar -xz -C $HOME/.local --strip-components=1 + ( - git clone https://github.com/glfw/glfw.git --branch 3.0.4 --depth 1 + git clone https://github.com/glfw/glfw.git --branch 3.1.1 --depth 1 mkdir glfw/build && cd glfw/build cmake -DBUILD_SHARED_LIBS=ON \ -DGLFW_BUILD_EXAMPLES=OFF \ -DGLFW_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=$HOME/.local \ .. - make -j4 && sudo make install + make -j4 && make install ) - sudo apt-get install lib32stdc++6 - sudo mkdir -p /usr/local - curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \ - | sudo tar -xz -C /usr/local --strip-components=1 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew tap homebrew/versions brew install qt5 glfw3 pkgconfig |