.travis.yml: fix architectures, add gcc on osx

diff --git a/.travis.yml b/.travis.yml
index adf4763..70ec38b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
     - python: 2.6
       os: linux
       compiler: gcc
-      env: ARCH=x86_64
+      env: ARCH=i386
     - python: 2.6
       os: linux
       compiler: clang
@@ -19,7 +19,7 @@ matrix:
     - python: 2.6
       os: linux
       compiler: clang
-      env: ARCH=x86_64
+      env: ARCH=i386
     - python: 2.7
       os: linux
       compiler: gcc
@@ -27,7 +27,7 @@ matrix:
     - python: 2.7
       os: linux
       compiler: gcc
-      env: ARCH=x86_64
+      env: ARCH=i386
     - python: 2.7
       os: linux
       compiler: clang
@@ -35,7 +35,7 @@ matrix:
     - python: 2.7
       os: linux
       compiler: clang
-      env: ARCH=x86_64
+      env: ARCH=i386
     - python: 3.4
       os: linux
       compiler: gcc
@@ -43,7 +43,7 @@ matrix:
     - python: 3.4
       os: linux
       compiler: clang
-      env: ARCH=x86_64
+      env: ARCH=i386
     - python: 3.4
       os: linux
       compiler: gcc
@@ -51,13 +51,23 @@ matrix:
     - python: 3.4
       os: linux
       compiler: clang
+      env: ARCH=i386
+    - language: C
+      os: osx
+      compiler: clang
+      env: ARCH=x86_64
+    - language: C
+      os: osx
+      compiler: gcc
       env: ARCH=x86_64
-    - language: generic
+    - language: C
       os: osx
+      compiler: clang
       env: ARCH=i386
-    - language: generic
+    - language: C
       os: osx
-      env: ARCH=x86_64
+      compiler: gcc
+      env: ARCH=i386
 
 addons:
   apt:
@@ -74,6 +84,11 @@ addons:
     - python3-dev
     - python3-numpy
 
+before install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libsndfile libsamplerate; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install setuptools numpy; fi
+
 script:
   - make build
   - make build_python