diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 68a5c40c705caa..401696b61c9a28 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -99,6 +99,18 @@ if(IMGUI_BUILD_SDL2_RENDERER_BINDING) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer2.cpp) endif() +if(IMGUI_BUILD_SDL3_BINDING) + find_package(SDL3 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC SDL3::SDL3) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl3.cpp) +endif() + +if(IMGUI_BUILD_SDL3_RENDERER_BINDING) + find_package(SDL3 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC SDL3::SDL3) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer3.cpp) +endif() + if(IMGUI_BUILD_VULKAN_BINDING) find_package(Vulkan REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC Vulkan::Vulkan) @@ -237,6 +249,14 @@ if(NOT IMGUI_SKIP_HEADERS) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer2.h DESTINATION include) endif() + if(IMGUI_BUILD_SDL3_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl3.h DESTINATION include) + endif() + + if(IMGUI_BUILD_SDL3_RENDERER_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer3.h DESTINATION include) + endif() + if(IMGUI_BUILD_VULKAN_BINDING) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.h DESTINATION include) endif() diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index a996b04c00b06b..b28ac216bcf500 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -18,6 +18,10 @@ if (@IMGUI_BUILD_SDL2_BINDING@ OR @IMGUI_BUILD_SDL2_RENDERER_BINDING@) find_dependency(SDL2 CONFIG) endif() +if (@IMGUI_BUILD_SDL3_BINDING@ OR @IMGUI_BUILD_SDL3_RENDERER_BINDING@) + find_dependency(SDL3 CONFIG) +endif() + if (@IMGUI_BUILD_VULKAN_BINDING@) find_dependency(Vulkan) endif() diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index a7e1be23bfc033..87a645f657973e 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -37,6 +37,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS osx-binding IMGUI_BUILD_OSX_BINDING sdl2-binding IMGUI_BUILD_SDL2_BINDING sdl2-renderer-binding IMGUI_BUILD_SDL2_RENDERER_BINDING + sdl3-binding IMGUI_BUILD_SDL3_BINDING + sdl3-renderer-binding IMGUI_BUILD_SDL3_RENDERER_BINDING vulkan-binding IMGUI_BUILD_VULKAN_BINDING win32-binding IMGUI_BUILD_WIN32_BINDING freetype IMGUI_FREETYPE diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index c78fb6532a108f..43d83b90d73731 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.91.6", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", @@ -107,6 +108,18 @@ "sdl2" ] }, + "sdl3-binding": { + "description": "Make available SDL3 binding", + "dependencies": [ + "sdl3" + ] + }, + "sdl3-renderer-binding": { + "description": "Make available SDL3 Renderer binding", + "dependencies": [ + "sdl3" + ] + }, "test-engine": { "description": "Build test engine", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 934afbbf5164ab..b045b378294e40 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3698,7 +3698,7 @@ }, "imgui": { "baseline": "1.91.6", - "port-version": 0 + "port-version": 1 }, "imgui-node-editor": { "baseline": "0.9.3", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 10ba5c28e13ae0..0679d2f1e0789e 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4faed498e3282a3110baad8de95ab394534f355b", + "version": "1.91.6", + "port-version": 1 + }, { "git-tree": "61d143dfebf9b720272a52d1d78a3082590f948a", "version": "1.91.6",