games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

conan: build for 64-bit windows by default

Browse Source 
This was strongly suggested by VCMI developers.
This commit is contained in:
Konstantin 2023-01-25 19:44:57 +03:00
parent 30784477e0
commit 38ebb62c3e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/github.yml vendored
View File

@ -121,7 +121,7 @@ jobs:
cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
cmake_args: -G Ninja
preset: windows-mingw-conan-linux
conan_profile: mingw32-linux.jinja
conan_profile: mingw64-linux.jinja
runs-on: ${{ matrix.os }}
defaults:
run:

8
CI/mingw-ubuntu/before_install.sh
View File

@ -2,15 +2,15 @@
sudo apt-get update
sudo apt-get install ninja-build mingw-w64 nsis
sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
# Workaround for getting new MinGW headers on Ubuntu 22.04.
# Remove it once MinGW headers version in repository will be 10.0 at least
curl -O -L http://mirrors.kernel.org/ubuntu/pool/universe/m/mingw-w64/mingw-w64-common_10.0.0-2_all.deb \
&& sudo dpkg -i mingw-w64-common_10.0.0-2_all.deb;
curl -O -L http://mirrors.kernel.org/ubuntu/pool/universe/m/mingw-w64/mingw-w64-i686-dev_10.0.0-2_all.deb \
&& sudo dpkg -i mingw-w64-i686-dev_10.0.0-2_all.deb;
curl -O -L http://mirrors.kernel.org/ubuntu/pool/universe/m/mingw-w64/mingw-w64-x86-64-dev_10.0.0-2_all.deb \
&& sudo dpkg -i mingw-w64-x86-64-dev_10.0.0-2_all.deb;
mkdir ~/.conan ; cd ~/.conan
curl -L "https://github.com/rilian-la-te/vcmi-deps-windows-conan/releases/download/0.0.1/vcmi-deps-windows-conan.tgz" \
curl -L "https://github.com/vcmi/vcmi-deps-windows-conan/releases/download/1.0/vcmi-deps-windows-conan-w64.tgz" \
| tar -xzf -