From 585131f4cc9109d6671465c20e012be97a001e10 Mon Sep 17 00:00:00 2001 From: divverent Date: Fri, 9 Jan 2015 07:08:21 +0000 Subject: [PATCH] Disable even mod_skeletal_animatevertices_sse on win32, as it's crashing too. Damn unaligned stack. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12131 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=b57ee47c0ea6f11447bc7a8c5108a468129be54d --- .travis-script-xonotic.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh index d064d99d..48f3d280 100755 --- a/.travis-script-xonotic.sh +++ b/.travis-script-xonotic.sh @@ -54,6 +54,7 @@ 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. chroot= makeflags='STRIP=: D3D=1 @@ -61,7 +62,7 @@ for os in "$@"; do 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 -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math" + 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" SDL_CONFIG="../../../${deps}/bin/sdl2-config" DP_LINK_CRYPTO=dlopen -- 2.39.2