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

Changes according to review

Browse Source
This commit is contained in:
Ivan Savenko 2024-10-14 13:23:48 +00:00
parent 55e79b1b96
commit ccd0edf13d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,8 +269,8 @@ jobs:
# Workaround for CPack bug on macOS 13 # Workaround for CPack bug on macOS 13
counter=0 counter=0
until cpack -C ${{matrix.pack_type}} || ((counter > 20)) until cpack -C ${{matrix.pack_type}} || ((counter > 20)); do
do sleep 3 sleep 3
((counter++)) ((counter++))
done done

2
CI/before_install/mingw.sh
View File

@ -4,4 +4,4 @@ sudo apt-get update
sudo apt-get install ninja-build mingw-w64 nsis 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 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 sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix

1
conanfile.py
View File

@ -70,6 +70,7 @@ class VCMI(ConanFile):
self.requires("sdl_mixer/2.0.4") self.requires("sdl_mixer/2.0.4")
elif self.settings.os == "Android": elif self.settings.os == "Android":
# On Android SDL version must be same as version of Java wrapper for SDL in VCMI source code # On Android SDL version must be same as version of Java wrapper for SDL in VCMI source code
# Wrapper can be found in following directory: android/vcmi-app/src/main/java/org/libsdl/app
self.requires("sdl/2.26.5") self.requires("sdl/2.26.5")
self.requires("sdl_mixer/2.0.4") self.requires("sdl_mixer/2.0.4")
else: else: