X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=inline;f=.travis-before_install-xonotic.sh;h=dc3cccea5c457b1e601914f0fbbe860bd6773564;hb=04d56ad46275e90b00ba3e65cdc6e52000bd34bb;hp=5b03c090baa4e891f33fe3e2fab7412031064910;hpb=ed383adf3a79182b3f3fd2c31bcd7a05693a4194;p=xonotic%2Fdarkplaces.git

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 5b03c090..dc3cccea 100755
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -11,22 +11,24 @@ for os in "$@"; do
 
   case "$os" in
     linux32)
-      wget https://www.libsdl.org/release/SDL2-2.0.4.tar.gz
-      tar xf SDL2-2.0.4.tar.gz
+      wget https://www.libsdl.org/release/SDL2-2.0.10.tar.gz
+      tar xf SDL2-2.0.10.tar.gz
       (
-      cd SDL2-2.0.4
+      cd SDL2-2.0.10
       export CC="gcc -m32"
-      i386 ./configure --enable-static --disable-shared --prefix="$USRLOCAL" || cat config.log
+      i386 ./configure --enable-static --disable-shared --prefix="$USRLOCAL" \
+        --enable-video-x11-xinput --enable-video-x11-xrandr ||\ cat config.log
       i386 make
       i386 make install
       )
       ;;
     linux64)
-      wget https://www.libsdl.org/release/SDL2-2.0.4.tar.gz
-      tar xf SDL2-2.0.4.tar.gz
+      wget https://www.libsdl.org/release/SDL2-2.0.10.tar.gz
+      tar xf SDL2-2.0.10.tar.gz
       (
-      cd SDL2-2.0.4
-      ./configure --enable-static --disable-shared --prefix="$USRLOCAL"
+      cd SDL2-2.0.10
+      ./configure --enable-static --disable-shared --prefix="$USRLOCAL" \
+        --enable-video-x11-xinput --enable-video-x11-xrandr ||\ cat config.log
       make
       make install
       )
@@ -35,13 +37,11 @@ for os in "$@"; do
       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 | tar xaJvf - -C"$USRLOCAL" opt/cross_toolchain_32
       ;;
     win64)
       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 | tar xvJf - -C"$USRLOCAL" opt/cross_toolchain_64
       ;;
     osx)
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \