elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-14 15:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

support winit-0.24

Browse Source
This commit is contained in:
Willem Verstraeten 2020-12-11 09:19:21 +01:00 committed by Thom Chiovoloni
parent 9210130872
commit 7e2293bde6
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imgui-examples/Cargo.toml
View File

@ -11,7 +11,7 @@ publish = false
[dev-dependencies]
clipboard = "0.5"
glium = { version = "0.28", default-features = true }
glium = { version = "0.29", default-features = true }
image = "0.23"
imgui = { path = "../imgui" }
imgui-glium-renderer = { path = "../imgui-glium-renderer" }

4
imgui-gfx-examples/Cargo.toml
View File

@ -18,12 +18,12 @@ default = ["opengl"]
[dev-dependencies]
gfx = "0.18"
gfx_device_gl = "0.16"
glutin = "0.25"
glutin = "0.26"
image = "0.23"
imgui = { path = "../imgui" }
imgui-gfx-renderer = { path = "../imgui-gfx-renderer" }
imgui-winit-support = { path = "../imgui-winit-support" }
old_school_gfx_glutin_ext = "0.25"
old_school_gfx_glutin_ext = "0.26"
[target.'cfg(windows)'.dev-dependencies]
gfx_device_dx11 = "0.8"

2
imgui-gfx-examples/examples/support/mod.rs
View File

@ -4,7 +4,7 @@ use glutin::{
event::{Event, WindowEvent},
event_loop::{ControlFlow, EventLoop},
// XXX for easier porting...
platform::desktop::EventLoopExtDesktop,
platform::run_return::EventLoopExtRunReturn,
window::WindowBuilder,
};
use imgui::{Context, FontConfig, FontGlyphRanges, FontSource, Ui};

2
imgui-glium-renderer/Cargo.toml
View File

@ -10,5 +10,5 @@ license = "MIT/Apache-2.0"
categories = ["gui", "rendering"]
[dependencies]
glium = { version = "0.28", default-features = false }
glium = { version = "0.29", default-features = false }
imgui = { version = "0.6.0", path = "../imgui", features = ["glium"] }

2
imgui-winit-support/Cargo.toml
View File

@ -14,7 +14,7 @@ imgui = { version = "0.6.0", path = "../imgui" }
winit-19 = { version = ">= 0.16, < 0.20", package = "winit", optional = true }
winit-20 = { version = ">= 0.20, < 0.22", package = "winit", optional = true }
winit-22 = { version = "0.22", package = "winit", optional = true }
winit-23 = { version = "0.23", package = "winit", optional = true }
winit-23 = { version = ">= 0.23, < 0.25", package = "winit", optional = true }
[features]
default = ["winit-23"]

2
imgui-winit-support/src/lib.rs
View File

@ -79,7 +79,7 @@
//!
//! The following versions are supported, controlled by the listed feature.
//!
//! - The `winit-23` feature uses winit versions compatible with `0.23`. This is
//! - The `winit-23` feature supports winit versions `0.23` and `0.24`. This is
//! on by default, so to use any other version you need to disable this crates
//! default features.
//! - The `winit-22` feature uses winit versions compatible with `0.22`.

2
imgui/Cargo.toml
View File

@ -14,7 +14,7 @@ exclude = ["/resources"]
[dependencies]
bitflags = "1.0"
glium = { version = "0.28", default-features = false, optional = true }
glium = { version = "0.29", default-features = false, optional = true }
gfx = { version = "0.18", optional = true }
imgui-sys = { version = "0.6.0", path = "../imgui-sys" }
parking_lot = "0.11"