From 3f9dd8f72b03ad4f96e546bc9b3e8817ac7a8875 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 18 Oct 2019 02:58:34 +0300 Subject: [PATCH] waifulib: sdl2: allow override version if using conan(actually not planned to do so, just in case) --- scripts/waifulib/sdl2.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/waifulib/sdl2.py b/scripts/waifulib/sdl2.py index 39ba179..abb4427 100644 --- a/scripts/waifulib/sdl2.py +++ b/scripts/waifulib/sdl2.py @@ -66,9 +66,14 @@ def configure(conf): conf.env.HAVE_SDL2 = 0 if not conf.env.HAVE_SDL2 and conf.env.CONAN: + if not conf.env.SDL2_VERSION: + version = '2.0.10' + else: + version = conf.env.SDL2_VERSION + conf.load('conan') conf.add_conan_remote('bincrafters', 'https://api.bintray.com/conan/bincrafters/public-conan') - conf.add_dependency('sdl2/2.0.9@bincrafters/stable', options = { 'shared': 'True' } ) + conf.add_dependency('sdl2/%s@bincrafters/stable' % version, options = { 'shared': 'True' } ) if conf.env.HAVE_SDL2 and conf.options.SDL2_SANITY_CHECK: try: