Now that SSE is off, we can also kill -mstackrealign. GCC bug worked around!

[xonotic/darkplaces.git] / .travis-script-xonotic.sh

diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 72f8dc08346d261c3bcff839e507c96a35ad3ec2..d064d99d665f291ccb82fd88f07312acb151aeec 100755 (executable)
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -55,14 +55,13 @@ for os in "$@"; do
       ;;
     win32)
       chroot=
-      # -mstackrealign works around SDL2-2.0.3 issue that stack is not 16 bytes aligned, breaking SSE.
-      # Please kill once SDL comes to its senses.
       makeflags='STRIP=:
         D3D=1
         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"
+        CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
+       CPUOPTIMIZATIONS="-march=pentium2 -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math"
         WINDRES="i686-w64-mingw32-windres"
         SDL_CONFIG="../../../${deps}/bin/sdl2-config"
         DP_LINK_CRYPTO=dlopen
@@ -71,7 +70,7 @@ for os in "$@"; do
         DP_LINK_ODE=dlopen
         DP_LINK_ZLIB=dlopen'
       maketargets='release'
-      outputs='darkplaces.exe:darkplaces-wgl.exe darkplaces-sdl.exe:darkplaces.exe darkplaces-dedicated.exe:darkplaces-dedicated.exe'
+      outputs='darkplaces.exe:darkplaces-x86-wgl.exe darkplaces-sdl.exe:darkplaces-x86.exe darkplaces-dedicated.exe:darkplaces-x86-dedicated.exe'
       ;;
     win64)
       chroot=
@@ -89,7 +88,7 @@ for os in "$@"; do
         DP_LINK_ODE=dlopen
         DP_LINK_ZLIB=dlopen'
       maketargets='release'
-      outputs='darkplaces.exe:darkplaces-x64-wgl.exe darkplaces-sdl.exe:darkplaces-x64.exe darkplaces-dedicated.exe:darkplaces-x64-dedicated.exe'
+      outputs='darkplaces.exe:darkplaces-wgl.exe darkplaces-sdl.exe:darkplaces.exe darkplaces-dedicated.exe:darkplaces-dedicated.exe'
       ;;
     osx)
       chroot=