silvana/implot-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Locked imgui versions down more. See comments.

Browse source 
Due to the yanking of imgui-winit-support 0.6.1, builds that did
not have a lock file started failing in places. I've now locked
the versions of imgui and friends to exactly 0.6.0 to avert those
issues for the time being, with the longer-term fix being the
upgrade of all those to 0.7.0 in #13.
This commit is contained in:
4bb4 2021-02-06 10:02:58 +01:00
parent 69396149d0
commit 6179cf1f8d
9 changed files with 3347 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -5,9 +5,5 @@
# Editor temporary files # Editor temporary files
**/*.swp **/*.swp
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock
# These are backup files generated by rustfmt # These are backup files generated by rustfmt
**/*.rs.bk **/*.rs.bk

2
Cargo.toml
View file

@ -12,7 +12,7 @@ readme = "README.md"
[dependencies] [dependencies]
implot-sys = { version = "0.3.0", path = "implot-sys" } implot-sys = { version = "0.3.0", path = "implot-sys" }
imgui = { version = "0.6.0" } imgui = { version = "=0.6.0" }
bitflags = "1.0" bitflags = "1.0"
parking_lot = "0.11" parking_lot = "0.11"
lazy_static = "1.1" lazy_static = "1.1"

2
implot-examples/examples-shared/Cargo.toml
View file

@ -8,4 +8,4 @@ edition = "2018"
[dependencies] [dependencies]
implot = { path = "../../" } implot = { path = "../../" }
imgui = "0.6.0" imgui = "=0.6.0"

1629
implot-examples/implot-glium-demo/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

8
implot-examples/implot-glium-demo/Cargo.toml
View file

@ -11,12 +11,12 @@ publish = false
[dependencies] [dependencies]
clipboard = "0.5" clipboard = "0.5"
glium = { version = "0.29", default-features = true } glium = { version = "0.28", default-features = true }
image = "0.23" image = "0.23"
imgui-sys = "0.6.0" imgui-sys = "0.6.0"
imgui = "0.6.0" imgui = "=0.6.0"
imgui-glium-renderer = "0.6.0" imgui-glium-renderer = "=0.6.0"
imgui-winit-support = "0.6.0" imgui-winit-support = "=0.6.0"
implot-sys = { path = "../../implot-sys" } implot-sys = { path = "../../implot-sys" }
implot = { path = "../../" } implot = { path = "../../" }

1705
implot-examples/implot-wgpu-demo/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

10
implot-examples/implot-wgpu-demo/Cargo.toml
View file

@ -7,10 +7,10 @@ edition = "2018"
[dependencies] [dependencies]
implot = { path = "../../" } implot = { path = "../../" }
wgpu = "^0.6.0" wgpu = "=0.6.0"
winit = "0.24" # opening windows and handling input winit = "0.23" # opening windows and handling input
futures = "^0.3.5" # executing async functions using blocking executor futures = "^0.3.5" # executing async functions using blocking executor
imgui = "^0.6.0" imgui = "=0.6.0"
imgui-winit-support = "^0.6.0" # connection of input (keys) to imgui imgui-winit-support = "=0.6.0" # connection of input (keys) to imgui
imgui-wgpu = "^0.12.0" # imgui backend for drawing using wgpu imgui-wgpu = "=0.12.0" # imgui backend for drawing using wgpu
examples-shared = { path = "../examples-shared" } examples-shared = { path = "../examples-shared" }

2
implot-sys-bindgen/Cargo.toml
View file

@ -6,4 +6,4 @@ edition = "2018"
[dependencies] [dependencies]
bindgen = "0.55.1" bindgen = "0.55.1"
imgui-sys = { version = "0.6.0" } imgui-sys = { version = "=0.6.0" }

2
implot-sys/Cargo.toml
View file

@ -12,7 +12,7 @@ build = "build.rs"
links = "implot" links = "implot"
[dependencies] [dependencies]
imgui-sys = "0.6.0" imgui-sys = "=0.6.0"
[build-dependencies] [build-dependencies]
cc = "1.0" cc = "1.0"