diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/travis/before_install.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index fe9243583..649486dad 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -17,17 +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 + 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 7z x -y -o/usr mingw.7z + 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 |