Update to glium 0.28, glutin 0.25 and winit 0.23

[mandelwow.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 00a6fc19a682a13d64fc8233d074d063a0f555da..2ba6d278cee740bc766a0c247b04dd3df91dc012 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,37 +1,43 @@
+#cargo-features = ["edition"]
+
 [package]
 name = "mandelwow"
 version = "0.7.0"
 authors = ["Bernie Innocenti <bernie@codewiz.org>"]
 license = "GPL-3.0+"
+edition = '2018'
 
 [profile.release]
 lto = true
-panic = "abort"
+panic = "unwind"
 opt-level = 3
 
 [dependencies]
 cgmath = "*"
-glium = "0.16.0"
-glutin = "0.7.4"
-genmesh = "0.4.1"
-image = { version = "0.14.0", features = ["png_codec"], optional = true }
+#gleam = "*"
+glium = "0.28"
+glutin = "0.25"
+winit = { version = "0.23", features = ["stdweb"] }
+image = { version = "*", features = ["png_codec"], optional = true }
+instant = "*"
 libxm = "1.0.0"
-obj = { version = "0.5", features = ["usegenmesh"] }
 rust-rocket = { path = "rust-rocket", optional = true }
 rand = "*"
 sdl2 = "*"
 
 [features]
-default = ["rust-rocket", "image"]
+default = ["image", "logging"]
 min = []
+logging = []
+editor = ["rust-rocket"]
 
-[replace]
-"glutin:0.7.4" = { path = "/home/bernie/src/glutin" }
-"glium:0.16.0" = { path = "/home/bernie/src/glium" }
+#[replace]
+#"glutin:0.7.4" = { path = "/home/bernie/src/glutin" }
+#"glium:0.16.0" = { path = "/home/bernie/src/glium" }
 
-[target.armv7-linux-androideabi]
-ar = "$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-ar"
-linker = "$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-clang"
+#[target.armv7-linux-androideabi]
+#ar = "$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-ar"
+#linker = "$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-clang"
 
 [lib]
 name = "mandelwow_lib"