octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis: Update GLFW on Linux to 3.1.1

Browse Source
This commit is contained in:
Yuri Kunde Schlesner
2015-07-10 20:04:28 -03:00
parent 73b6a715ee
commit a60f2a93d2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis-deps.sh
View File

@@ -7,10 +7,13 @@ set -x
if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
export CC=gcc-4.9 export CC=gcc-4.9
export CXX=g++-4.9 export CXX=g++-4.9
mkdir -p $HOME/.local 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 mkdir glfw/build && cd glfw/build
cmake -DBUILD_SHARED_LIBS=ON \ cmake -DBUILD_SHARED_LIBS=ON \
-DGLFW_BUILD_EXAMPLES=OFF \ -DGLFW_BUILD_EXAMPLES=OFF \
@@ -20,9 +23,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
make -j4 && make install make -j4 && make install
) )
curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \
| tar -xz -C $HOME/.local --strip-components=1
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew tap homebrew/versions brew tap homebrew/versions
brew install qt5 glfw3 pkgconfig brew install qt5 glfw3 pkgconfig