TE_EXPLOSION2: don't crash on colorLength == 0.

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

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 30489d317fc97cb88bf1d1da281ecf41bf039747..8d8ce4d6d9a76a8d12c5d1062631f0e9bc22fc92 100755 (executable)
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -46,14 +46,16 @@ for os in "$@"; do
       )
       ;;
     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
-      # Easiest way to statically link to libwinpthread is to delete the shared version.
-      sudo rm /opt/cross_toolchain_32/bin/libwinpthread-1.dll /opt/cross_toolchain_32/i686-w64-mingw32/lib/libwinpthread.dll.a
       ;;
     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
-      # Easiest way to statically link to libwinpthread is to delete the shared version.
-      sudo rm /opt/cross_toolchain_64/bin/libwinpthread-1.dll /opt/cross_toolchain_64/x86_64-w64-mingw32/lib/libwinpthread.dll.a
       ;;
     osx)
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \