diff --git a/.travis.yml b/.travis.yml index 357b595a0a..546134c0e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,8 @@ cache: apt: true env: - - OPENRCT2_CMAKE_OPTS= - - OPENRCT2_CMAKE_OPTS="-DDISABLE_NETWORK=ON" + - OPENRCT2_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt" + - OPENRCT2_CMAKE_OPTS="-DDISABLE_NETWORK=ON -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt" sudo: required diff --git a/build.sh b/build.sh index 6f48556dc1..ac73080354 100755 --- a/build.sh +++ b/build.sh @@ -56,7 +56,7 @@ fi pushd build echo OPENRCT2_CMAKE_OPTS = $OPENRCT_CMAKE_OPTS - cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug $OPENRCT2_CMAKE_OPTS .. + cmake -DCMAKE_BUILD_TYPE=Debug $OPENRCT2_CMAKE_OPTS .. make popd diff --git a/install.sh b/install.sh index 93d64307f5..71a204430a 100755 --- a/install.sh +++ b/install.sh @@ -74,6 +74,7 @@ if [[ `uname` == "Darwin" ]]; then popd fi elif [[ `uname` == "Linux" ]]; then + sudo dpkg --add-architecture i386 sudo apt-get update if [[ -z "$TRAVIS" ]]; then sudo apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake @@ -81,7 +82,10 @@ elif [[ `uname` == "Linux" ]]; then sudo apt-get install -y wine fi else - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake + apt-cache search libsdl2 + apt-cache policy libsdl2-dev:i386 + apt-cache policy libsdl2-dev + sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake libsdl2-dev:i386 libsdl2-ttf-dev:i386 fi fi