X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=.travis-before_install-xonotic.sh;h=5ed56f85637cf0d6a634e3554c4626c266775b52;hp=a36b141c406b927e4e006328faa6b7284ee7e438;hb=2af7bf1a4eb9a5c9a1cfe76f9f8690523bafbd3e;hpb=3470e1323d4fe070840046d93d616d3a16b840a5

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index a36b141c..5ed56f85 100755
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -24,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
@@ -36,19 +36,25 @@ 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)
+      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)