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-build.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-build.sh')
| -rwxr-xr-x | .travis-build.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index 8ec2ed70..22a3a9fd 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -11,8 +11,12 @@ fi #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then + export CC=gcc-4.9 + export CXX=g++-4.9 + export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH + mkdir build && cd build - cmake -DUSE_QT5=OFF .. + cmake -DCITRA_FORCE_QT4=ON .. make -j4 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then export Qt5_DIR=$(brew --prefix)/opt/qt5 |