Update to glium 0.28, glutin 0.25 and winit 0.23

Tested only on x86_64-unknown-linux-gnu. WebAssembly support is still
broken and needs porting from emcripten to stdweb.

diff --git a/Cargo.toml b/Cargo.toml
index e683780b800ca3042e2d0e4b00a219e3d0103a33..2ba6d278cee740bc766a0c247b04dd3df91dc012 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,15 +15,15 @@ opt-level = 3
 [dependencies]
 cgmath = "*"
 #gleam = "*"
-glium = "0.27"
-glutin = "0.24"
+glium = "0.28"
+glutin = "0.25"
+winit = { version = "0.23", features = ["stdweb"] }
 image = { version = "*", features = ["png_codec"], optional = true }
 instant = "*"
 libxm = "1.0.0"
 rust-rocket = { path = "rust-rocket", optional = true }
 rand = "*"
 sdl2 = "*"
-winit = { version = "*", features = ["stdweb"] }
 
 [features]
 default = ["image", "logging"]
@@ -35,9 +35,9 @@ editor = ["rust-rocket"]
 #"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"

diff --git a/main.rs b/main.rs
index 3b07180313e4ce50ef1be991610dc4782157b761..9d2563c2f599b0a47db1f0d6f487fa887f557e78 100644 (file)
--- a/main.rs
+++ b/main.rs
@@ -249,7 +249,7 @@ fn main() {
             emscripten_GetProcAddress(addr.into_raw() as *const _) as *const _
         });
     gl.glGetInternalformativ(0, 0, 0, 0, 0);
-*/
+    */
 
     let mut soundplayer = sound::start();
 
@@ -274,7 +274,7 @@ fn main() {
 
     let mut timer = Timer::new();
     let mut camera = support::camera::CameraState::new();
-    let mut fullscreen = true;
+    let mut fullscreen = false;
 
     event_loop.run(move |event, _, control_flow| {
         let t = timer.t;
@@ -315,9 +315,9 @@ fn main() {
                                     VirtualKeyCode::F11 | VirtualKeyCode::Return => {
                                         fullscreen ^= true;
                                         let fs = if fullscreen {
-                                            let monitor_handle = display.gl_window().window()
-                                                .available_monitors().next().unwrap();
-                                            Some(glium::glutin::window::Fullscreen::Borderless(monitor_handle))
+                                            // let monitor_handle = display.gl_window().window()
+                                            //    .available_monitors().next().unwrap();
+                                            Some(glium::glutin::window::Fullscreen::Borderless(None))
                                         } else {
                                             None
                                         };