From 04a1a446cf845a0db80d39fd0e42771aa07e4492 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 5 Dec 2014 15:54:19 +0100 Subject: Build for win32 & win64 on Travis too --- .travis.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 59cdba062..4bce211f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +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 pool.sks-keyservers.net --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 gettext -script: - - mkdir -p travisbuild - - cd travisbuild - - cmake -DENABLE_GETTEXT=1 .. - - make -j2 +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 -- cgit v1.2.3