diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-11 00:21:39 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-11 01:00:59 +0200 |
| commit | 73b6a715eeb8a837d6528921a4ad00f7a1c7aa17 (patch) | |
| tree | 6fea8104fe5165482f0fe7c8edaa019f1991eb82 | |
| parent | Merge pull request #906 from aroulin/loader-format-specifier-warning (diff) | |
| download | yuzu-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 | |
| -rwxr-xr-x | .travis-build.sh | 6 | ||||
| -rwxr-xr-x | .travis-deps.sh | 16 | ||||
| -rw-r--r-- | .travis-upload.sh | 1 | ||||
| -rw-r--r-- | .travis.yml | 15 |
4 files changed, 28 insertions, 10 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index 8ec2ed70c..22a3a9fd6 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 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 diff --git a/.travis-upload.sh b/.travis-upload.sh index 0904b646a..3a15e8f6a 100644 --- a/.travis-upload.sh +++ b/.travis-upload.sh @@ -7,7 +7,6 @@ if [ "$TRAVIS_BRANCH" = "master" ]; then UPLOAD_DIR="/citra/nightly/linux-amd64" mkdir "$REV_NAME" - sudo apt-get -qq install lftp cp build/src/citra/citra "$REV_NAME" cp build/src/citra_qt/citra-qt "$REV_NAME" elif [ "$TRAVIS_OS_NAME" = "osx" ]; then diff --git a/.travis.yml b/.travis.yml index 5c882a574..a4ec8ab81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,21 @@ env: global: - secure: "AXHFIafTmbGDsHD3mUVj5a4I397DQjti/WoqAJGUp2PglxTcc04BwxZ9Z+xLuf5N2Hs5r9ojAJLT8OGxJCLBDXzneQTNSqXbFuYSLbqrEAiIRlA9eRIotWCg+wYcO+5e8MKX+cHVKwiIWasUB21AtCdq6msh6Y3pUshZp212VPg=" +sudo: false + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.9 + - g++-4.9 + - xorg-dev + - libglu1-mesa-dev + - libxcursor-dev + - lib32stdc++6 # For CMake + - lftp # To upload builds + before_install: - sh .travis-deps.sh |