]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Disable even mod_skeletal_animatevertices_sse on win32, as it's crashing too. Damn...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 9 Jan 2015 07:08:21 +0000 (07:08 +0000)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 9 Jan 2015 07:10:55 +0000 (08:10 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12131 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b57ee47c0ea6f11447bc7a8c5108a468129be54d

.travis-script-xonotic.sh

index d064d99d665f291ccb82fd88f07312acb151aeec..48f3d280c703070111c303eee9018f73214380a3 100755 (executable)
@@ -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