Use the standard MinGW for Ubuntu 12.04 LTS

Seems like Travis is using precise, use default version.
Leaving the Ubuntu 14.04 LTS config, in the git history.

Fix the YAML syntax so that is actually runs it, too.
Apparently it just "overwrote" it with the ASan build.

diff --git a/.travis.yml b/.travis.yml
index 5f920b88d5705a75536fcff4d196a3982a681106..1c5d0d9969396914056c824fcd6d6119f39d85cd 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ addons:
         packages:
             - elfutils
             - zlib1g-dev
-            - gcc-mingw-w64-i686
-            - binutils-mingw-w64-i686
+            - mingw32
+            - mingw32-binutils
 
 os:
     - linux
@@ -19,9 +19,8 @@ compiler:
 matrix:
     include:
         - os: linux
-          compiler: gcc
-          env: HOST="--host=i686-w64-mingw32" TEST="test/main.exe"
-    include:
+          compiler: i586-mingw32msvc-gcc
+          env: HOST="--host=i586-mingw32msvc" TEST="test/main.exe"
         - os: linux
           compiler: clang
           env: CFLAGS="-fsanitize=address -g" ASAN_OPTIONS="detect_leaks=0"