Use a newer build chain for win32/win64.

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

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 982de6d8a59999c5516894da1f10255cd2b54260..30489d317fc97cb88bf1d1da281ecf41bf039747 100755 (executable)
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -46,12 +46,14 @@ for os in "$@"; do
       )
       ;;
     win32)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
+      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)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
+      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 \