@@ -39,13 +39,9 @@ class VCMI(ConanFile):
3939 "with_ffmpeg" : True ,
4040 }
4141
42- @property
43- def _isMobilePlatform (self ):
44- return self .settings .os == "iOS" or self .settings .os == "Android"
45-
4642 def config_options (self ):
4743 # static on "single app" platforms
48- isSdlShared = not self ._isMobilePlatform
44+ isSdlShared = not ( self .settings . os == "iOS" or self . settings . os == "Android" )
4945 self .options ["sdl" ].shared = isSdlShared
5046 self .options ["sdl_image" ].shared = isSdlShared
5147 self .options ["sdl_mixer" ].shared = isSdlShared
@@ -80,7 +76,7 @@ def requirements(self):
8076 # SDL versions between 2.22-2.26.1 have broken sound
8177 # self.requires("sdl/[^2.26.1 || >=2.0.20 <=2.22.0]")
8278 # versions before 2.30.7 don't build for Android with NDK 27: https://github.com/libsdl-org/SDL/issues/9792
83- self .requires ("sdl/2.30.9 " , override = True )
79+ self .requires ("sdl/2.32.2 " , override = True )
8480
8581 # launcher
8682 if self .settings .os == "Android" :
@@ -108,11 +104,11 @@ def validate(self):
108104 if not is_apple_os (self ) and qtDep .options .openssl != True :
109105 raise ConanInvalidConfiguration ("qt:openssl option for non-Apple OS must be set to True, otherwise mods can't be downloaded" )
110106
111- def _pathForCmake (self , path ):
107+ def _pathForCmake (self , path ) -> str :
112108 # CMake doesn't like \ in strings
113109 return path .replace (os .path .sep , os .path .altsep ) if os .path .altsep else path
114110
115- def _generateRuntimeLibsFile (self ):
111+ def _generateRuntimeLibsFile (self ) -> str :
116112 # create file with list of libs to copy to the package for distribution
117113 runtimeLibsFile = self ._pathForCmake (os .path .join (self .build_folder , "_runtime_libs.txt" ))
118114
0 commit comments