mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-22 22:13:35 +02:00
Changes according to review
This commit is contained in:
parent
55e79b1b96
commit
ccd0edf13d
4
.github/workflows/github.yml
vendored
4
.github/workflows/github.yml
vendored
@ -269,8 +269,8 @@ jobs:
|
||||
|
||||
# Workaround for CPack bug on macOS 13
|
||||
counter=0
|
||||
until cpack -C ${{matrix.pack_type}} || ((counter > 20))
|
||||
do sleep 3
|
||||
until cpack -C ${{matrix.pack_type}} || ((counter > 20)); do
|
||||
sleep 3
|
||||
((counter++))
|
||||
done
|
||||
|
||||
|
@ -70,6 +70,7 @@ class VCMI(ConanFile):
|
||||
self.requires("sdl_mixer/2.0.4")
|
||||
elif self.settings.os == "Android":
|
||||
# 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_mixer/2.0.4")
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user