]> git.lizzy.rs Git - minetest.git/commitdiff
Fix windows toolchain due to missing packages, upgrade to more recent toolchain
authorLoic Blot <loic.blot@unix-experience.fr>
Mon, 21 May 2018 19:00:56 +0000 (21:00 +0200)
committerSmallJoker <mk939@ymail.com>
Sun, 3 Jun 2018 15:32:00 +0000 (17:32 +0200)
util/travis/before_install.sh

index a4328fa46aff74ba09096efe2b4c59f57bea31f5..af69f78ca055e2ce1d98f443d1d627e726cc1159 100755 (executable)
@@ -1,4 +1,5 @@
 #!/bin/bash -e
+
 echo "Preparing for $TRAVIS_COMMIT_RANGE"
 
 if [[ "$LINT" == "1" ]]; then
@@ -37,13 +38,17 @@ if [[ $PLATFORM == "Unix" ]]; then
                #brew upgrade postgresql
        fi
 elif [[ $PLATFORM == "Win32" ]]; then
-       wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z
+       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
 elif [[ $PLATFORM == "Win64" ]]; then
-       wget http://minetest.kitsunemimi.pw/mingw_w64_x86_64_ubuntu12.04_4.9.1.7z -O mingw.7z
+       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
        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