From 4fa4c491c75a2fd76067ce7191943da05d340915 Mon Sep 17 00:00:00 2001 From: divverent Date: Mon, 29 Dec 2014 11:11:15 +0000 Subject: [PATCH] Realign stack for SDL/win32 builds. Yes, annoying, and costs performance. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12111 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=0afeccfe1289b64245baf48979b6a694d077b6f0 --- .travis-script-xonotic.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh index 0be07620..15f2b315 100755 --- a/.travis-script-xonotic.sh +++ b/.travis-script-xonotic.sh @@ -33,7 +33,9 @@ for os in "$@"; do ;; win32) chroot= - makeflags='STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i686-w64-mingw32-windres" SDL_CONFIG="../../../${deps}/bin/sdl2-config" DP_LINK_ZLIB=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen WIN32RELEASE=1 D3D=1' + # -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=: DP_MAKE_TARGET=mingw UNAME=MINGW32 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_ZLIB=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen WIN32RELEASE=1 D3D=1' maketargets='release' outputs='darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe' ;; -- 2.39.2