Skip to content

Commit 588b89a

Browse files
get SDL Java sources from the Conan package
1 parent 2296a8d commit 588b89a

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

conanfile.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ def requirements(self):
6666
if self.options.with_ffmpeg:
6767
self.requires("ffmpeg/[>=4.4]")
6868

69-
# On Android SDL version must be the same as the version of Java wrapper for SDL in VCMI source code
70-
# Wrapper can be found in the following directory: android/vcmi-app/src/main/java/org/libsdl/app
7169
# TODO: try enabling version range once there's no conflict
7270
# sdl_image & sdl_ttf depend on earlier version
7371
# ERROR: Version conflict: Conflict between sdl/2.28.5 and sdl/2.28.3 in the graph.
@@ -143,6 +141,7 @@ def generate(self):
143141
tc.variables["CONAN_RUNTIME_LIBS_FILE"] = self._generateRuntimeLibsFile()
144142
if self.settings.os == "Android":
145143
tc.variables["CMAKE_ANDROID_API"] = str(self.settings.os.api_level)
144+
tc.variables["SDL_JAVA_SRC_DIR"] = os.path.join(self.dependencies.host["sdl"].package_folder, "share", "java", "SDL2")
146145
elif self.settings.os == "Windows":
147146
tc.variables["CONAN_RUNENV_SCRIPT"] = self._pathForCmake(os.path.join(self.build_folder, "conanrun.bat"))
148147
tc.generate()

0 commit comments

Comments
 (0)