From 99110dc460a452a8375d46c7bbca4849d0c8fb8d Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sun, 18 May 2014 20:28:50 -0700
Subject: Travis: Added OSX, use default compilers, moved cmds into own scripts

---
 .travis.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to '.travis.yml')

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
-- 
cgit v1.2.3