Merge branch 'master' of gitlab.com:berniecodewiz/mandelwow

diff --git a/Cargo.toml b/Cargo.toml
index bd89f3be106179a08cbf92c65492bbcc3e299f66..e683780b800ca3042e2d0e4b00a219e3d0103a33 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,13 +15,15 @@ opt-level = 3
 [dependencies]
 cgmath = "*"
 #gleam = "*"
-glium = "0.26.0"
-glutin = "0.23.0"
+glium = "0.27"
+glutin = "0.24"
 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"]

diff --git a/main.rs b/main.rs
index 86421b4941a7c1c68b1462ef3e26d13e6168df9b..3b07180313e4ce50ef1be991610dc4782157b761 100644 (file)
--- a/main.rs
+++ b/main.rs
@@ -6,7 +6,7 @@ use glium::{Display, Program, Surface, uniform};
 use mandelwow_lib::*;
 use std::f32::consts::PI;
 use std::rc::Rc;
-use std::time::{Duration, Instant};
+use instant::{Duration, Instant};
 
 #[cfg(target_os = "emscripten")]
 use std::os::raw::{c_int, c_void};

diff --git a/release_wasm.sh b/release_wasm.sh
index 43fdf2305eef0d00f768691c6b171ef67118be27..a7aa015bce8edb79e6522b50124f769dea2236f0 100755 (executable)
--- a/release_wasm.sh
+++ b/release_wasm.sh
@@ -2,7 +2,7 @@ set -e
 export CFLAGS="-O2"
 export CXXFLAGS="$CFLAGS"
 cargo rustc --target wasm32-unknown-emscripten --release --bin mandelwow -- \
-  -C link-args='--emrun -s USE_SDL=2 -s ERROR_ON_MISSING_LIBRARIES=0 -s ASSERTIONS=2 --preload-file flora.xm'
+  -C link-args='--emrun -s ASSERTIONS=2 --preload-file flora.xm'
 cp -a target/wasm32-unknown-emscripten/release/mandelwow.{js,wasm} .
 cp -a target/wasm32-unknown-emscripten/release/deps/mandelwow.data .
 emrun .