diff options
| author |  archshift | 2014-05-18 20:28:50 -0700 |
|---|---|---|
| committer | archshift | 2014-06-17 22:57:15 -0700 |
| commit | 99110dc460a452a8375d46c7bbca4849d0c8fb8d (patch) | |
| tree | 1e490ce1a73189207fe92e832365cf0a37a325aa | |
| parent | Merge pull request #4 from archshift/patch-1 (diff) | |
| download | yuzu-99110dc460a452a8375d46c7bbca4849d0c8fb8d.tar.gz yuzu-99110dc460a452a8375d46c7bbca4849d0c8fb8d.tar.xz yuzu-99110dc460a452a8375d46c7bbca4849d0c8fb8d.zip | |
Travis: Added OSX, use default compilers, moved cmds into own scripts
| -rw-r--r-- | .travis-build.sh | 14 | ||||
| -rw-r--r-- | .travis-deps.sh | 18 | ||||
| -rw-r--r-- | .travis.yml | 19 |
3 files changed, 40 insertions, 11 deletions
diff --git a/.travis-build.sh b/.travis-build.sh new file mode 100644 index 000000000..35a908bfb --- /dev/null +++ b/.travis-build.sh | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | set -e | ||
| 4 | |||
| 5 | #if OS is linux or is not set | ||
| 6 | if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then | ||
| 7 | mkdir build && cd build | ||
| 8 | cmake .. | ||
| 9 | make -j4 | ||
| 10 | elif [ "$TRAVIS_OS_NAME" = osx ]; then | ||
| 11 | mkdir build && cd build | ||
| 12 | cmake .. -GXcode | ||
| 13 | xcodebuild | ||
| 14 | fi | ||
diff --git a/.travis-deps.sh b/.travis-deps.sh new file mode 100644 index 000000000..326ba2d09 --- /dev/null +++ b/.travis-deps.sh | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | set -e | ||
| 4 | |||
| 5 | #if OS is linux or is not set | ||
| 6 | if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then | ||
| 7 | sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y | ||
| 8 | sudo apt-get -qq update | ||
| 9 | sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libglew-dev libxcursor-dev | ||
| 10 | sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 | ||
| 11 | git clone https://github.com/glfw/glfw.git | ||
| 12 | mkdir glfw/build && cd glfw/build | ||
| 13 | cmake .. && make && sudo make install | ||
| 14 | cd - | ||
| 15 | elif [ "$TRAVIS_OS_NAME" = osx ]; then | ||
| 16 | brew tap homebrew/versions | ||
| 17 | brew install glew qt glfw3 pkgconfig | ||
| 18 | fi | ||
diff --git a/.travis.yml b/.travis.yml index 8bad122b2..1cb369d5b 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -1,14 +1,11 @@ | |||
| 1 | os: | ||
| 2 | - linux | ||
| 3 | - osx | ||
| 4 | |||
| 1 | language: cpp | 5 | language: cpp |
| 2 | compiler: | 6 | |
| 3 | - gcc | ||
| 4 | before_install: | 7 | before_install: |
| 5 | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y | 8 | - sh .travis-deps.sh |
| 6 | - sudo apt-get -qq update | 9 | |
| 7 | - sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libglew-dev libxcursor-dev | ||
| 8 | - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 | ||
| 9 | - git clone https://github.com/glfw/glfw.git | ||
| 10 | - "mkdir glfw/build && cd glfw/build && cmake .. && make && sudo make install ; cd -" | ||
| 11 | script: | 10 | script: |
| 12 | - mkdir build && cd build | 11 | - sh .travis-build.sh |
| 13 | - cmake .. | ||
| 14 | - make -j4 \ No newline at end of file | ||