@@ -39,13 +39,9 @@ class VCMI(ConanFile):
39
39
"with_ffmpeg" : True ,
40
40
}
41
41
42
- @property
43
- def _isMobilePlatform (self ):
44
- return self .settings .os == "iOS" or self .settings .os == "Android"
45
-
46
42
def config_options (self ):
47
43
# static on "single app" platforms
48
- isSdlShared = not self ._isMobilePlatform
44
+ isSdlShared = not ( self .settings . os == "iOS" or self . settings . os == "Android" )
49
45
self .options ["sdl" ].shared = isSdlShared
50
46
self .options ["sdl_image" ].shared = isSdlShared
51
47
self .options ["sdl_mixer" ].shared = isSdlShared
@@ -80,7 +76,7 @@ def requirements(self):
80
76
# SDL versions between 2.22-2.26.1 have broken sound
81
77
# self.requires("sdl/[^2.26.1 || >=2.0.20 <=2.22.0]")
82
78
# 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 )
84
80
85
81
# launcher
86
82
if self .settings .os == "Android" :
@@ -108,11 +104,11 @@ def validate(self):
108
104
if not is_apple_os (self ) and qtDep .options .openssl != True :
109
105
raise ConanInvalidConfiguration ("qt:openssl option for non-Apple OS must be set to True, otherwise mods can't be downloaded" )
110
106
111
- def _pathForCmake (self , path ):
107
+ def _pathForCmake (self , path ) -> str :
112
108
# CMake doesn't like \ in strings
113
109
return path .replace (os .path .sep , os .path .altsep ) if os .path .altsep else path
114
110
115
- def _generateRuntimeLibsFile (self ):
111
+ def _generateRuntimeLibsFile (self ) -> str :
116
112
# create file with list of libs to copy to the package for distribution
117
113
runtimeLibsFile = self ._pathForCmake (os .path .join (self .build_folder , "_runtime_libs.txt" ))
118
114
0 commit comments