diff --git a/Cargo.toml b/Cargo.toml index e0d3e15..12a5211 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,4 +16,4 @@ travis-ci = { repository = "gekkio/imgui-rs" } imgui-sys = { version = "0.0.14-pre", path = "imgui-sys" } [workspace] -members = ["imgui-sys", "imgui-glium-renderer"] +members = ["imgui-examples", "imgui-sys", "imgui-glium-renderer"] diff --git a/README.markdown b/README.markdown index 7a6d7f5..147b2a8 100644 --- a/README.markdown +++ b/README.markdown @@ -45,12 +45,12 @@ ui.window(im_str!("Hello world")) ## Compiling and running the demos -Examples are under the imgui-glium-renderer directory. +Examples are under the imgui-examples directory. git clone https://github.com/Gekkio/imgui-rs cd imgui-rs git submodule update --init --recursive - cd imgui-glium-renderer + cd imgui-examples cargo test cargo run --example hello_world diff --git a/examples_are_under_imgui-glium-renderer b/examples_are_under_imgui-glium-renderer deleted file mode 100644 index e69de29..0000000 diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml new file mode 100644 index 0000000..dd40129 --- /dev/null +++ b/imgui-examples/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "imgui-examples" +version = "0.0.14-pre" +authors = ["Joonas Javanainen ", "imgui-rs contributors"] +description = "imgui crate examples" +homepage = "https://github.com/gekkio/imgui-rs" +repository = "https://github.com/gekkio/imgui-rs" +license = "MIT/Apache-2.0" +publish = false + +[dev-dependencies] +glium = { version = "0.16", default-features = true } +imgui = { version = "0.0.14-pre", path = "../" } +imgui-glium-renderer = { version = "0.0.14-pre", path = "../imgui-glium-renderer" } +imgui-sys = { version = "0.0.14-pre", path = "../imgui-sys", features = ["glium"] } diff --git a/imgui-glium-renderer/examples/hello_world.rs b/imgui-examples/examples/hello_world.rs similarity index 100% rename from imgui-glium-renderer/examples/hello_world.rs rename to imgui-examples/examples/hello_world.rs diff --git a/imgui-glium-renderer/examples/support/mod.rs b/imgui-examples/examples/support/mod.rs similarity index 100% rename from imgui-glium-renderer/examples/support/mod.rs rename to imgui-examples/examples/support/mod.rs diff --git a/imgui-glium-renderer/examples/test_window.rs b/imgui-examples/examples/test_window.rs similarity index 100% rename from imgui-glium-renderer/examples/test_window.rs rename to imgui-examples/examples/test_window.rs diff --git a/imgui-glium-renderer/examples/test_window_impl.rs b/imgui-examples/examples/test_window_impl.rs similarity index 100% rename from imgui-glium-renderer/examples/test_window_impl.rs rename to imgui-examples/examples/test_window_impl.rs diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml index 1a56a4e..bb7342b 100644 --- a/imgui-glium-renderer/Cargo.toml +++ b/imgui-glium-renderer/Cargo.toml @@ -12,6 +12,3 @@ categories = ["gui", "rendering"] glium = { version = "0.16", default-features = false } imgui = { version = "0.0.14-pre", path = "../" } imgui-sys = { version = "0.0.14-pre", path = "../imgui-sys", features = ["glium"] } - -[dev-dependencies] -glium = { version = "0.16", default-features = true }