summaryrefslogtreecommitdiffstats
path: root/.travis-deps.sh
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-11 00:21:39 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-11 01:00:59 +0200
commit73b6a715eeb8a837d6528921a4ad00f7a1c7aa17 (patch)
tree6fea8104fe5165482f0fe7c8edaa019f1991eb82 /.travis-deps.sh
parentMerge pull request #906 from aroulin/loader-format-specifier-warning (diff)
downloadyuzu-73b6a715eeb8a837d6528921a4ad00f7a1c7aa17.tar
yuzu-73b6a715eeb8a837d6528921a4ad00f7a1c7aa17.tar.gz
yuzu-73b6a715eeb8a837d6528921a4ad00f7a1c7aa17.tar.bz2
yuzu-73b6a715eeb8a837d6528921a4ad00f7a1c7aa17.tar.lz
yuzu-73b6a715eeb8a837d6528921a4ad00f7a1c7aa17.tar.xz
yuzu-73b6a715eeb8a837d6528921a4ad00f7a1c7aa17.tar.zst
yuzu-73b6a715eeb8a837d6528921a4ad00f7a1c7aa17.zip
Diffstat (limited to '')
-rwxr-xr-x.travis-deps.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh
index b9561bb66..6ab71a4ab 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
(
git clone https://github.com/glfw/glfw.git --branch 3.0.4 --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
+ | tar -xz -C $HOME/.local --strip-components=1
+
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew tap homebrew/versions
brew install qt5 glfw3 pkgconfig