X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=.travis-before_install-xonotic.sh;h=dc3cccea5c457b1e601914f0fbbe860bd6773564;hp=5ed56f85637cf0d6a634e3554c4626c266775b52;hb=415f1e0e46791994cfa2f6dd3a29f793e3bb9cd9;hpb=d85d3ae5246bd89abc0f6c77b2de80313a153f1b

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 5ed56f85..dc3cccea 100755
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -2,9 +2,8 @@
 
 set -ex
 
-if [ "`uname`" = 'Linux' ]; then
-  sudo apt-get update -qq
-fi
+export USRLOCAL="$PWD"/usrlocal
+mkdir "$USRLOCAL"
 
 for os in "$@"; do
   git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
@@ -12,50 +11,37 @@ for os in "$@"; do
 
   case "$os" in
     linux32)
-      # Prepare an i386 chroot. This is required as we otherwise can't install
-      # our dependencies to be able to compile a 32bit binary. Ubuntu...
-      chroot="$PWD"/buildroot.i386
-      mkdir -p "$chroot$PWD"
-      sudo apt-get install -y debootstrap
-      sudo i386 debootstrap --arch=i386 precise "$chroot"
-      sudo mount --rbind "$PWD" "$chroot$PWD"
-      sudo i386 chroot "$chroot" apt-get install -y \
-        build-essential
-      # 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.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
-      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
+      cd SDL2-2.0.10
+      export CC="gcc -m32"
+      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)
-      sudo apt-get install -y \
-        libxpm-dev libsdl1.2-dev libxxf86vm-dev
-      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
+      cd SDL2-2.0.10
+      ./configure --enable-static --disable-shared --prefix="$USRLOCAL" \
+        --enable-video-x11-xinput --enable-video-x11-xrandr ||\ cat config.log
       make
-      sudo make install
+      make install
       )
       ;;
     win32)
       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)
       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 \