Revert "If one compiler fails, try another."

This reverts commit 660001dce93be41b85d5d1e92d4a6afa5de2db33.

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

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 9cfae9eb186bbf6b807b59e795bc1403bb0ce8c5..982de6d8a59999c5516894da1f10255cd2b54260 100755 (executable)
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -46,6 +46,8 @@ 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 7c814c8cb8d55b1e6cc03cf9b84a89cc1f0a38a3..72f8dc08346d261c3bcff839e507c96a35ad3ec2 100755 (executable)
--- 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="i586-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -mstackrealign -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
-        WINDRES="i586-mingw32msvc-windres"
+        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"
         SDL_CONFIG="../../../${deps}/bin/sdl2-config"
         DP_LINK_CRYPTO=dlopen
         DP_LINK_CRYPTO_RIJNDAEL=dlopen