Port to glium 0.17 and glutin 0.9.

[mandelwow.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 00a6fc19a682a13d64fc8233d074d063a0f555da..9c1bd7f403b2a2749f6bc1169d9323f868466027 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,13 +6,14 @@ license = "GPL-3.0+"
 
 [profile.release]
 lto = true
-panic = "abort"
+# the crate `bitflags` is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
+panic = "unwind"
 opt-level = 3
 
 [dependencies]
 cgmath = "*"
-glium = "0.16.0"
-glutin = "0.7.4"
+glium = "0.17.0"
+glutin = "0.9"
 genmesh = "0.4.1"
 image = { version = "0.14.0", features = ["png_codec"], optional = true }
 libxm = "1.0.0"
@@ -22,12 +23,14 @@ 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"