Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Finally fixed dependency hell #774

Merged
merged 2 commits into from May 5, 2024
Merged

Finally fixed dependency hell #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04ebd7a
Hopefully finally fixed dependency hell
Rob2309 Apr 24, 2024
e4d10ca
Removed stray println!
Rob2309 Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -13,6 +13,3 @@ members = [

package.rust-version = "1.70"
resolver = "2"

[patch.crates-io]
glium = { git="https://github.com/glium/glium" }
2 changes: 1 addition & 1 deletion imgui-examples/Cargo.toml
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ publish = false

[dev-dependencies]
copypasta = "0.8"
glium = { version = "0.33.0", default-features = true }
glium = { version = "0.34.0", default-features = true }
image = "0.23"
imgui = { path = "../imgui", features = ["tables-api"] }
imgui-glium-renderer = { path = "../imgui-glium-renderer" }
Expand Down
4 changes: 2 additions & 2 deletions imgui-glium-renderer/Cargo.toml
View file
Open in desktop
Expand Up @@ -10,11 +10,11 @@ license = "MIT OR Apache-2.0"
categories = ["gui", "rendering"]

[dependencies]
glium = { version = "0.33.0", default-features = false }
glium = { version = "0.34.0", default-features = false }
imgui = { version = "0.11.0", path = "../imgui" }

[dev-dependencies]
glium = { version = "0.33.0", default-features = false, features = ["glutin_backend"] }
glium = { version = "0.34.0", default-features = false, features = ["glutin_backend"] }
imgui-winit-support = {path = "../imgui-winit-support"}
glutin = "0.31.1"
glutin-winit = "0.4.2"
Expand Down
2 changes: 1 addition & 1 deletion imgui-glow-renderer/Cargo.toml
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ categories = ["gui", "rendering"]

[dependencies]
imgui = { version = "0.11.0", path = "../imgui" }
glow = "0.12.0"
glow = "0.13.1"
memoffset = "0.9"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion imgui-sdl2-support/Cargo.toml
View file
Open in desktop
Expand Up @@ -15,6 +15,6 @@ imgui = { version = "0.11.0", path = "../imgui" }
sdl2 = "0.34.5"

[dev-dependencies]
glow = "0.12.0"
glow = "0.13.1"
imgui-glow-renderer = { version = "0.11.0", path = "../imgui-glow-renderer" }
sdl2 = { version = "0.34.5", features = ["bundled", "static-link"] }
2 changes: 1 addition & 1 deletion imgui-winit-glow-renderer-viewports/Cargo.toml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
imgui = { version = "0.11.0", path="../imgui", features=["docking"] }

glow = "0.12.0"
glow = "0.13.1"
glutin = "0.31.1"
glutin-winit = "0.4.2"
raw-window-handle = "0.5.0"
Expand Down
2 changes: 0 additions & 2 deletions imgui-winit-support/src/lib.rs
View file
Open in desktop
Expand Up @@ -483,8 +483,6 @@ impl WinitPlatform {
// https://github.com/ocornut/imgui/issues/5047
handle_key_modifier(io, &key, pressed);

println!("KEY EVENT: {event:?}");

// Add main key event
if let Some(key) = to_imgui_key(key, event.location) {
io.add_key_event(key, pressed);
Expand Down