Optimize noise implementations

[oweals/minetest.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 2cd867295757058407dcf279804a6ec74cba1b04..4bce211f7af5ddcd455edeb1f2be6e686b7ba89a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,18 @@ language: cpp
 compiler:
   - gcc
   - clang
-before_install:
-  - if [ $CC = "clang" ]; then export PATH="/usr/bin/:$PATH"; sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'; sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 92DE8183; sudo apt-get update; sudo apt-get install llvm-3.1; sudo apt-get install clang; fi
-  - sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev
-script: cmake . && make
+env:
+  - WINDOWS=32
+  - WINDOWS=64
+  - WINDOWS=no
+before_install: ./util/travis/before_install.sh
+script: ./util/travis/script.sh
 notifications:
   email: false
+matrix:
+  fast_finish: true
+  exclude:
+    - env: WINDOWS=32
+      compiler: clang
+    - env: WINDOWS=64
+      compiler: clang