only use __int128 math on x86_64

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

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index adb87e901bc0830d2ce054c569a9cea7c0939264..5ed56f85637cf0d6a634e3554c4626c266775b52 100755 (executable)
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -7,6 +7,9 @@ if [ "`uname`" = 'Linux' ]; then
 fi
 
 for os in "$@"; do
+  git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
+    --prefix=".deps/${os}/" master:"misc/builddeps/${os}" | tar xvf -
+
   case "$os" in
     linux32)
       # Prepare an i386 chroot. This is required as we otherwise can't install
@@ -21,10 +24,10 @@ for os in "$@"; do
       # Now install our dependencies.
       sudo i386 chroot "$chroot" apt-get install -y \
         libxpm-dev libsdl1.2-dev libxxf86vm-dev
-      wget https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-      tar xf SDL2-2.0.3.tar.gz
+      wget https://www.libsdl.org/release/SDL2-2.0.4.tar.gz
+      tar xf SDL2-2.0.4.tar.gz
       (
-      cd SDL2-2.0.3
+      cd SDL2-2.0.4
       sudo i386 chroot "$chroot" sh -c "cd $PWD && ./configure --enable-static --disable-shared"
       sudo i386 chroot "$chroot" make -C "$PWD"
       sudo i386 chroot "$chroot" make -C "$PWD" install
@@ -33,32 +36,34 @@ for os in "$@"; do
     linux64)
       sudo apt-get install -y \
         libxpm-dev libsdl1.2-dev libxxf86vm-dev
-      wget https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-      tar xf SDL2-2.0.3.tar.gz
+      wget https://www.libsdl.org/release/SDL2-2.0.4.tar.gz
+      tar xf SDL2-2.0.4.tar.gz
       (
-      cd SDL2-2.0.3
+      cd SDL2-2.0.4
       ./configure --enable-static --disable-shared
       make
       sudo make install
       )
       ;;
     win32)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
+      git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
+        --prefix=".icons/" master:"misc/logos/icons_ico" | tar xvf -
+      mv .icons/xonotic.ico darkplaces.ico
+      wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_32.tar.xz | sudo tar xaJvf - -C/ opt/cross_toolchain_32
       ;;
     win64)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
+      git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
+        --prefix=".icons/" master:"misc/logos/icons_ico" | tar xvf -
+      mv .icons/xonotic.ico darkplaces.ico
+      wget -qO- http://beta.xonotic.org/win-builds.org/cross_toolchain_64.tar.xz | sudo tar xvJf - -C/ opt/cross_toolchain_64
       ;;
     osx)
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
-        --prefix=SDL.framework/ master:misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework | tar xvf -
+        --prefix=SDL2.framework/ master:misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL2.framework | tar xvf -
       ;;
   esac
 done
 
-git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
-  --prefix=.deps/ master:misc/builddeps | tar xvf -
 for X in .deps/*; do
   rsync --remove-source-files -aL "$X"/*/ "$X"/ || true
 done