From a564dacf0094af6f32873f37a3d56e0e28b83f05 Mon Sep 17 00:00:00 2001
From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 9 Jan 2015 08:51:03 +0000
Subject: [PATCH] Use a newer build chain for win32/win64.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12132 d7cf8633-e32d-0410-b094-e92efae38249
---
 .travis-before_install-xonotic.sh | 10 ++++++----
 .travis-script-xonotic.sh         | 12 ++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 982de6d8..30489d31 100755
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -46,12 +46,14 @@ for os in "$@"; do
       )
       ;;
     win32)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
+      wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_32.tar.xz | sudo tar xaJvf - -C/ opt/cross_toolchain_32
+      # Easiest way to statically link to libwinpthread is to delete the shared version.
+      sudo rm /opt/cross_toolchain_32/bin/libwinpthread-1.dll /opt/cross_toolchain_32/i686-w64-mingw32/lib/libwinpthread.dll.a
       ;;
     win64)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
+      wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_64.tar.xz | sudo tar xvJf - -C/ opt/cross_toolchain_64
+      # Easiest way to statically link to libwinpthread is to delete the shared version.
+      sudo rm /opt/cross_toolchain_64/bin/libwinpthread-1.dll /opt/cross_toolchain_64/x86_64-w64-mingw32/lib/libwinpthread.dll.a
       ;;
     osx)
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 48f3d280..5c2c4e34 100755
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -54,16 +54,16 @@ for os in "$@"; do
       outputs='darkplaces-glx:darkplaces-linux64-glx darkplaces-sdl:darkplaces-linux64-sdl darkplaces-dedicated:darkplaces-linux64-dedicated'
       ;;
     win32)
-      # For now SSE is turned off due to unavoidable bugs in the version of mingw-w64 travis has.
+      # Need to use -mstackrealign as nothing guarantees that callbacks from
+      # other Win32 DLLs - including SDL2 - retain 16 bytes alignment.
       chroot=
       makeflags='STRIP=:
         D3D=1
         DP_MAKE_TARGET=mingw
         UNAME=MINGW32
         WIN32RELEASE=1
-        CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
-	CPUOPTIMIZATIONS="-march=pentium2 -DNO_SSE -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math"
-        WINDRES="i686-w64-mingw32-windres"
+        CC="/opt/cross_toolchain_32/bin/i686-w64-mingw32-gcc -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
+        WINDRES="/opt/cross_toolchain_32/bin/i686-w64-mingw32-windres"
         SDL_CONFIG="../../../${deps}/bin/sdl2-config"
         DP_LINK_CRYPTO=dlopen
         DP_LINK_CRYPTO_RIJNDAEL=dlopen
@@ -80,8 +80,8 @@ for os in "$@"; do
         DP_MAKE_TARGET=mingw
         UNAME=MINGW32
         WIN64RELEASE=1
-        CC="x86_64-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
-        WINDRES="x86_64-w64-mingw32-windres"
+        CC="/opt/cross_toolchain_64/bin/x86_64-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        WINDRES="/opt/cross_toolchain_64/bin/x86_64-w64-mingw32-windres"
         SDL_CONFIG="../../../${deps}/bin/sdl2-config"
         DP_LINK_CRYPTO=dlopen
         DP_LINK_CRYPTO_RIJNDAEL=dlopen
-- 
2.39.2