diff options
| author |  archshift <admin@archshift.com> | 2014-05-18 20:28:50 -0700 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-06-17 22:57:15 -0700 |
| commit | 99110dc460a452a8375d46c7bbca4849d0c8fb8d (patch) | |
| tree | 1e490ce1a73189207fe92e832365cf0a37a325aa /.travis.yml | |
| parent | 74f972651566bdd1266115fc9dd9a1b652f8dbec (diff) | |
Travis: Added OSX, use default compilers, moved cmds into own scripts
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 8bad122b..1cb369d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,11 @@ +os: + - linux + - osx + language: cpp -compiler: - - gcc + before_install: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - sudo apt-get -qq update - - sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libglew-dev libxcursor-dev - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 - - git clone https://github.com/glfw/glfw.git - - "mkdir glfw/build && cd glfw/build && cmake .. && make && sudo make install ; cd -" + - sh .travis-deps.sh + script: - - mkdir build && cd build - - cmake .. - - make -j4
\ No newline at end of file + - sh .travis-build.sh |