Skip to content

Commit 76ad497

Browse files
authored
imgui-sfml: fix imgui dependency version (#8606)
* imgui-sfml: fix imgui dependency version (#8605) * imgui-sfml: fix package test unused return value warning * imgui-sfml: use add_deps auto version resolution
1 parent 7fd9d16 commit 76ad497

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

packages/i/imgui-sfml/xmake.lua

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ package("imgui-sfml")
1111
add_versions("v2.5", "3775c9303f656297f2392e91ffae2021e874ee319b4139c60076d6f757ede109")
1212

1313
add_deps("cmake")
14-
add_deps("imgui")
1514
add_deps("opengl", {optional = true})
1615

1716
if is_plat("windows", "mingw") then
@@ -21,6 +20,11 @@ package("imgui-sfml")
2120
add_links("ImGui-SFML")
2221

2322
on_load(function(package)
23+
if package:version():eq("v3.0") then
24+
package:add("deps", "imgui >=1.91.1 <=1.91.9")
25+
else
26+
package:add("deps", "imgui")
27+
end
2428
if package:is_plat("linux") and package:config("shared") then
2529
package:add("deps", "sfml", {configs = {shared = true}})
2630
else
@@ -73,10 +77,11 @@ package("imgui-sfml")
7377
#include <SFML/Graphics/RenderWindow.hpp>
7478
#include <SFML/System/Clock.hpp>
7579
#include <SFML/Window/Event.hpp>
80+
#include <tuple>
7681
void test() {
77-
sf::RenderWindow window(sf::VideoMode({640, 480}), "ImGui + SFML = <3");
82+
sf::RenderWindow window(sf::VideoMode({640, 480}), "ImGui + SFML");
7883
window.setFramerateLimit(60);
79-
ImGui::SFML::Init(window);
84+
std::ignore = ImGui::SFML::Init(window);
8085
}
8186
]]}, {configs = {languages = "c++17"}}))
8287
end)

0 commit comments

Comments
 (0)