Added way for dependencies to use options and fixed compilation of ImGui with SDL3 backend.

SConscript

@@ -348,15 +348,19 @@ def _find_version(env: Environment, dependency: _Dependency):
         versions = dependency.recipe.versions(env, update=update, **kwargs)
         _sort_versions(versions)
         for version in versions:
+            kwargs = {}
+            dependencies_signature = inspect.signature(dependency.recipe.dependencies)
+            if 'options' in dependencies_signature.parameters:
+                kwargs['options'] = dependency.version_spec.options
             if _version_matches(version, dependency.version_spec):
                 canadd = True
-                for depname, depspec in dependency.recipe.dependencies(env, version).items():
+                for depname, depspec in dependency.recipe.dependencies(env, version, **kwargs).items():
                     if not _can_add_dependency(env, depname, _parse_version_spec(depspec)):
                         canadd = False
                         break
                 if canadd:
                     depdeps = []
-                    for depname, depspec in dependency.recipe.dependencies(env, version).items():
+                    for depname, depspec in dependency.recipe.dependencies(env, version, **kwargs).items():
                         depdeps.append(_add_dependency(env, depname, _parse_version_spec(depspec)))
                     dependency.version = version
                     dependency.depdeps = depdeps

addons/gitbranch.py

@@ -91,8 +91,12 @@ def _git_recipe(env: Environment, globals: dict, repo_name, repo_url, cook_fn, v
         else:
             return [(0, 0, 0)]
 
-    def _dependencies(env: Environment, version) -> 'dict':
+    def _dependencies(env: Environment, version, options: dict) -> 'dict':
-        return dependencies_cb(env, version)
+        dependencies_signature = inspect.signature(dependencies_cb)
+        kwargs = {}
+        if 'options' in dependencies_signature.parameters:
+            kwargs['options'] = options
+        return dependencies_cb(env, version, **kwargs)
 
     def _cook(env: Environment, version, options: dict = {}) -> dict:
         if 'ref' in options:

recipes/imgui/recipe.py

@@ -1,8 +1,23 @@
 
 
+from itertools import chain
 import re
 from SCons.Script import *
 
+_BACKEND_DEPENDENCIES = {
+    'sdl3': {
+        'SDL': {
+            'min': (3, 0, 0)
+        }
+    }
+}
+
+def _dependencies(env: Environment, version, options: dict) -> dict:
+    deps = {}
+    for backend in chain(env.get('IMGUI_BACKENDS', []), options.get('backends', [])):
+        deps.update(_BACKEND_DEPENDENCIES.get(backend, {}))
+    return deps
+
 def _git_cook(env: Environment, repo: dict, options: dict) -> dict:
     imgui_source_files = [
         os.path.join(repo['checkout_root'], 'imgui.cpp'),
@@ -11,20 +26,19 @@ def _git_cook(env: Environment, repo: dict, options: dict) -> dict:
         os.path.join(repo['checkout_root'], 'imgui_widgets.cpp')
     ]
 
-    for backend in env.get('IMGUI_BACKENDS', []):
+    for backend in chain(env.get('IMGUI_BACKENDS', []), options.get('backends', [])):
-        imgui_source_files.append(os.path.join(repo['checkout_root'], 'backends', f'imgui_impl_{backend}.cpp'))
-    for backend in options.get('backends', []):
         imgui_source_files.append(os.path.join(repo['checkout_root'], 'backends', f'imgui_impl_{backend}.cpp'))
 
-    env.StaticLibrary(
+    lib_imgui = env.StaticLibrary(
         CPPPATH = [repo['checkout_root']],
         CPPDEFINES = ['IMGUI_IMPL_VULKAN_NO_PROTOTYPES=1'],
         target = env['LIB_DIR'] + '/imgui',
-        source = imgui_source_files
+        source = imgui_source_files,
+        dependencies = _dependencies(env, None, options)
     )
     return {
         'CPPPATH': [repo['checkout_root']],
-        'LIBS': [os.path.join(env['LIB_DIR'], env.LibFilename('imgui'))]
+        'LIBS': [lib_imgui]
     }
 
 def _tag_pattern(env, options: dict):
@@ -45,5 +59,6 @@ env.GitRecipe(
     repo_url = 'https://github.com/ocornut/imgui.git',
     tag_pattern = _tag_pattern,
     tag_fn = _tag_fn,
-    cook_fn = _git_cook
+    cook_fn = _git_cook,
+    dependencies = _dependencies
 )