Merge pull request #1033 from Eroc33/master

Finish all_winit_gfx example
PistonDevelopers · Aug 20, 2017 · 347fb99 · 347fb99
2 parents 3343845 + 8bced2c
commit 347fb99
Show file tree

Hide file tree

Showing 5 changed files with 782 additions and 279 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,18 +48,19 @@ rusttype = "0.2.0"
 glium = { version = "0.17", optional = true }
 winit = { version = "0.7", optional = true }
 piston2d-graphics = { version = "0.21.1", optional = true }
+gfx = { version = "0.16.1", optional = true }
+gfx_core = { version = "0.7.0", optional = true }
 
 [features]
 piston = ["piston2d-graphics"]
+gfx_rs=["gfx","gfx_core"]
 
 [dev-dependencies]
 find_folder = "0.3.0"
 image = "0.13.0"
 rand = "0.3.13"
 # glutin_gfx.rs example dependencies
-gfx = "0.15.1"
-gfx_core = "0.7.0"
-gfx_window_glutin = "0.15.0"
-glutin = "0.7.0"
+gfx_window_glutin = "0.17.0"
+glutin = "0.9.0"
 # piston_window.rs example dependencies
 piston_window = "0.65.0"