From e65d8840dc6919492ce81b7f4f029c71df6e7195 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 12 May 2018 23:43:16 -0600 Subject: [PATCH] travis: use cmake in official repository (MinGW) --- .travis/linux-mingw/docker.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis/linux-mingw/docker.sh b/.travis/linux-mingw/docker.sh index 418858322..f113dbdd7 100755 --- a/.travis/linux-mingw/docker.sh +++ b/.travis/linux-mingw/docker.sh @@ -3,18 +3,13 @@ cd /citra MINGW_PACKAGES="sdl2-mingw-w64 qt5base-mingw-w64 qt5tools-mingw-w64 libsamplerate-mingw-w64 qt5multimedia-mingw-w64" apt-get update -apt-get install -y gpg wget git python3-pip ccache g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools +apt-get install -y gpg wget git python3-pip ccache g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake # HACK: the repository does not contain necessary packages for 18.04, we'll use packages for 17.10 for now echo 'deb http://ppa.launchpad.net/tobydox/mingw-w64/ubuntu artful main ' > /etc/apt/sources.list.d/extras.list apt-key adv --keyserver keyserver.ubuntu.com --recv '72931B477E22FEFD47F8DECE02FE5F12ADDE29B2' apt-get update apt-get install -y ${MINGW_PACKAGES} -# Get a recent version of CMake -wget -q --show-progress https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.sh -echo y | sh cmake-3.10.1-Linux-x86_64.sh --prefix=cmake -export PATH=/citra/cmake/cmake-3.10.1-Linux-x86_64/bin:$PATH - # fix a problem in current MinGW headers wget -q https://github.com/Alexpux/mingw-w64/raw/d0d7f784833bbb0b2d279310ddc6afb52fe47a46/mingw-w64-headers/crt/errno.h -O /usr/x86_64-w64-mingw32/include/errno.h