X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=util%2Ftravis%2Fbefore_install.sh;h=649486dad6e341a659f10b17b34b3dd141cd2639;hb=e94ba07a69fc81adb815824253e4c2dfa36512f3;hp=fef054130dd1f49f6c9451444503d37f94b541f7;hpb=a6a04c4b5b0cd475ea265b63ff6ff52daf66db42;p=dragonfireclient.git

diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index fef054130..649486dad 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -17,19 +17,13 @@ if [[ $PLATFORM == "Unix" ]] || [[ ! -z "${CLANG_TIDY}" ]]; then
 		install_macosx_deps
 	fi
 elif [[ $PLATFORM == "Win32" ]]; then
-	sudo apt-get update
-	sudo apt-get install p7zip-full
-	wget http://minetest.kitsunemimi.pw/mingw-w64-i686_7.1.1_ubuntu14.04.7z -O mingw.7z
-	sed -e "s|%PREFIX%|i686-w64-mingw32|" \
-		-e "s|%ROOTPATH%|/usr/i686-w64-mingw32|" \
-		< util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw.cmake
-	sudo 7z x -y -o/usr mingw.7z
+	wget http://minetest.kitsunemimi.pw/mingw-w64-i686_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
+	# buildwin32.sh detects the installed toolchain automatically
+	sudo tar -xaf mingw.tar.xz -C /usr
 elif [[ $PLATFORM == "Win64" ]]; then
-	sudo apt-get update
-	sudo apt-get install p7zip-full
-	wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_7.1.1_ubuntu14.04.7z -O mingw.7z
+	wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
 	sed -e "s|%PREFIX%|x86_64-w64-mingw32|" \
 		-e "s|%ROOTPATH%|/usr/x86_64-w64-mingw32|" \
 		< util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw64.cmake
-	sudo 7z x -y -o/usr mingw.7z
+	sudo tar -xaf mingw.tar.xz -C /usr
 fi