Skip to content

Commit

Permalink
Merge pull request imgui-rs#171 from malikolivier/patch-use-support-g…
Browse files Browse the repository at this point in the history
…lutin-exclude-examples

Use imgui-glutin-support in examples and split examples [use "exclude" Cargo.toml feature]

This implement the suggestions discussed in imgui-rs#163 and imgui-rs#168.

- Use imgui-glutin-support crate in all examples.
- Exclude examples from the main workspace to prevent glutin version conflicts
- Allow setting HIDPI factor to imgui-glutin-support crate for current examples to work on all platform.

Then, I committed a working Cargo.lock for the examples so that the correct version of glutin be selected in all cases.
  • Loading branch information
malikolivier authored Nov 7, 2018
2 parents 4da1e5f + b18fb57 commit 77c79f4
Show file tree
Hide file tree
Showing 18 changed files with 1,633 additions and 396 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ before_install:
script:
- cargo build --all --verbose
- cargo test --all --verbose
- cargo build --all --verbose --manifest-path imgui-examples/Cargo.toml
- cargo build --all --verbose --manifest-path imgui-glium-examples/Cargo.toml
11 changes: 10 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,13 @@ travis-ci = { repository = "Gekkio/imgui-rs" }
imgui-sys = { version = "0.0.22-pre", path = "imgui-sys" }

[workspace]
members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer", "imgui-glutin-support"]
members = [
"imgui-sys",
"imgui-gfx-renderer",
"imgui-glium-renderer",
"imgui-glutin-support"
]
exclude = [
"imgui-examples",
"imgui-glium-examples",
]
Loading

0 comments on commit 77c79f4

Please sign in to comment.