From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 8 Jan 2015 16:27:43 +0000 (+0000)
Subject: If one compiler fails, try another.
X-Git-Tag: xonotic-v0.8.0~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=58342ed2afb69d3c0fd3422829b79dd14fa9552b;p=xonotic%2Fdarkplaces.git

If one compiler fails, try another.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12126 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=660001dce93be41b85d5d1e92d4a6afa5de2db33
---

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 982de6d8..9cfae9eb 100755
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -46,8 +46,6 @@ for os in "$@"; do
       )
       ;;
     win32)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
       ;;
     win64)
       sudo apt-get install -y \
diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 72f8dc08..7c814c8c 100755
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -62,8 +62,8 @@ for os in "$@"; do
         DP_MAKE_TARGET=mingw
         UNAME=MINGW32
         WIN32RELEASE=1
-        CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -mstackrealign -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
-        WINDRES="i686-w64-mingw32-windres"
+        CC="i586-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -mstackrealign -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
+        WINDRES="i586-mingw32msvc-windres"
         SDL_CONFIG="../../../${deps}/bin/sdl2-config"
         DP_LINK_CRYPTO=dlopen
         DP_LINK_CRYPTO_RIJNDAEL=dlopen