X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.travis-script-xonotic.sh;h=8ea9ba089b133bca41b97db7aa8c869a91ee2cd5;hb=1da342cb637815a1eb2d9d96384ceb6fa4765d3f;hp=8b8f5c900adde28903ed122f3dbfc4b69c0d0fd6;hpb=3c69ebebce675210e2cc74c399cedecfac7bdcb0;p=xonotic%2Fdarkplaces.git

diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 8b8f5c90..8ea9ba08 100755
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -9,6 +9,8 @@ set -x
 chmod 0600 id_rsa-xonotic
 # ssh-keygen -y -f id_rsa-xonotic
 
+export USRLOCAL="$PWD"/usrlocal
+
 rev=`git rev-parse HEAD`
 
 sftp -oStrictHostKeyChecking=no -i id_rsa-xonotic -P 2222 -b - autobuild-bin-uploader@beta.xonotic.org <<EOF || true
@@ -20,10 +22,10 @@ for os in "$@"; do
   deps=".deps/${os}"
   case "${os}" in
     linux32)
-      chroot="sudo chroot ${PWD}/buildroot.i386"
+      chroot=
       makeflags='STRIP=:
         CC="${CC} -m32 -march=i686 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
-        SDL_CONFIG=sdl2-config
+        SDL_CONFIG=$USRLOCAL/bin/sdl2-config
         DP_LINK_CRYPTO=shared
           LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a"
         DP_LINK_CRYPTO_RIJNDAEL=dlopen
@@ -31,7 +33,7 @@ for os in "$@"; do
           LIB_JPEG=../../../${deps}/lib/libjpeg.a
         DP_LINK_ODE=shared
           CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE"
-          LIB_ODE="../../../${deps}/lib/libode.a"
+          LIB_ODE="../../../${deps}/lib/libode.a -lstdc++"
         DP_LINK_ZLIB=shared'
       maketargets='release'
       outputs='darkplaces-glx:darkplaces-linux32-glx darkplaces-sdl:darkplaces-linux32-sdl darkplaces-dedicated:darkplaces-linux32-dedicated'
@@ -40,7 +42,7 @@ for os in "$@"; do
       chroot=
       makeflags='STRIP=:
         CC="${CC} -m64 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
-        SDL_CONFIG=sdl2-config
+        SDL_CONFIG=$USRLOCAL/bin/sdl2-config
         DP_LINK_CRYPTO=shared
           LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a"
         DP_LINK_CRYPTO_RIJNDAEL=dlopen
@@ -48,22 +50,23 @@ for os in "$@"; do
           LIB_JPEG="../../../${deps}/lib/libjpeg.a"
         DP_LINK_ODE=shared
           CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE"
-          LIB_ODE="../../../${deps}/lib/libode.a"
+          LIB_ODE="../../../${deps}/lib/libode.a -lstdc++"
         DP_LINK_ZLIB=shared'
       maketargets='release'
       outputs='darkplaces-glx:darkplaces-linux64-glx darkplaces-sdl:darkplaces-linux64-sdl darkplaces-dedicated:darkplaces-linux64-dedicated'
       ;;
     win32)
+      # other Win32 DLLs - including SDL2 - retain 16 bytes alignment.
+      export LD_LIBRARY_PATH="$USRLOCAL/opt/cross_toolchain_32/x86_64-slackware-linux/i686-w64-mingw32/lib:$USRLOCAL/opt/cross_toolchain_32/libexec/gcc/i686-w64-mingw32/4.8.3"
       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.
+      # Need to use -mstackrealign as nothing guarantees that callbacks from
       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"
-        WINDRES="i686-w64-mingw32-windres"
+        CC="$USRLOCAL/opt/cross_toolchain_32/bin/i686-w64-mingw32-gcc -static -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        WINDRES="$USRLOCAL/opt/cross_toolchain_32/bin/i686-w64-mingw32-windres"
         SDL_CONFIG="../../../${deps}/bin/sdl2-config"
         DP_LINK_CRYPTO=dlopen
         DP_LINK_CRYPTO_RIJNDAEL=dlopen
@@ -71,17 +74,18 @@ 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)
+      export LD_LIBRARY_PATH="$USRLOCAL/opt/cross_toolchain_64/x86_64-slackware-linux/x86_64-w64-mingw32/lib:$USRLOCAL/opt/cross_toolchain_64/libexec/gcc/x86_64-w64-mingw32/4.8.3"
       chroot=
       makeflags='STRIP=:
         D3D=1
         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="$USRLOCAL/opt/cross_toolchain_64/bin/x86_64-w64-mingw32-gcc -static -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        WINDRES="$USRLOCAL/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
@@ -89,12 +93,12 @@ 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=
       makeflags='STRIP=:
-        CC="gcc -g1 -arch x86_64 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk -mmacosx-version-min=10.5 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        CC="gcc -g1 -arch x86_64 -mmacosx-version-min=10.6 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
         SDLCONFIG_MACOSXCFLAGS="-I${PWD}/SDL2.framework/Headers"
         SDLCONFIG_MACOSXLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers"
         SDLCONFIG_MACOSXSTATICLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers"
@@ -108,16 +112,21 @@ for os in "$@"; do
       ;;
   esac
 
+  # Condense whitespace in makeflags.
+  makeflags=$(
+    printf "%s\n" "$makeflags" | tr '\n' ' '
+  )
+
   (
-  trap "${chroot} make -C ${PWD} ${makeflags} clean" EXIT
-  eval "${chroot} make -C ${PWD} ${makeflags} ${maketargets}"
-  for o in $outputs; do
-    src=${o%%:*}
-    dst=${o#*:}
-    sftp -oStrictHostKeyChecking=no -i id_rsa-xonotic -P 2222 -b - autobuild-bin-uploader@beta.xonotic.org <<EOF
+    trap "${chroot} make -C ${PWD} ${makeflags} clean" EXIT
+    eval "${chroot} make -C ${PWD} ${makeflags} ${maketargets}"
+    for o in $outputs; do
+      src=${o%%:*}
+      dst=${o#*:}
+      sftp -oStrictHostKeyChecking=no -i id_rsa-xonotic -P 2222 -b - autobuild-bin-uploader@beta.xonotic.org <<EOF
 put ${src} ${rev}/${dst}
 EOF
-  done
+    done
   )
 
 done