1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00

try libsdl2-dev:i386

This commit is contained in:
Michał Janiszewski
2015-09-18 13:51:46 +02:00
parent a762390abe
commit 30cccce98b
3 changed files with 8 additions and 4 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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