2 files changed, 55 insertions, 1 deletions

diff --git a/.travis.yml b/.travis.yml
index 36912d0..56b82da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,30 @@ compiler:
 os:
         - linux
         - osx
-script: "./dist.sh"
+env:
+        - ARCH=native
+        - ARCH=mingw32
+        - ARCH=mingw64
+matrix:
+        include:
+                - compiler: clang
+                        os: osx
+                       env: ARCH=native
+                - compiler: gcc
+                        os: osx
+                       env: ARCH=native
+                - compiler: clang
+                        os: linux
+                       env: ARCH=native
+                - compiler: gcc
+                        os: linux
+                       env: ARCH=native
+                - compiler: gcc
+                        os: linux
+                       env: ARCH=mingw32
+                - compiler: gcc
+                        os: linux
+                       env: ARCH=mingw64
+
+script:
+        "./scripts/travis"
diff --git a/scripts/travis b/scripts/travis
new file mode 100755
index 0000000..4d28782
--- /dev/null
+++ b/scripts/travis
@@ -0,0 +1,28 @@
+#!/bin/sh
+set -e
+
+./autogen.sh
+
+if [ "x$ARCH" = "xnative" ]; then
+        ./configure --enable-libtls
+        make clean
+        make -j distcheck
+else
+        CPU=i686
+        if [ "x$ARCH" = "xmingw64" ]; then
+                CPU=x86_64
+        fi
+        export CC=$CPU-w64-mingw32-gcc
+
+        if [ -z $(which $CC) ]; then
+                # Update Ubuntu 12.04 with current mingw toolchain
+                apt-get update && apt-get install -y python-software-properties
+                apt-add-repository -y ppa:tobydox/mingw-x-precise
+                apt-get update && apt-get install -y $ARCH-x-gcc make
+                export PATH=$PATH:/opt/$ARCH/bin
+        fi
+
+        ./configure --host=$CPU-w64-mingw32 --enable-libtls
+        make clean
+        make -j
+fi