Disable Rocket in the default build and update build instructions.

diff --git a/Cargo.toml b/Cargo.toml
index f327b65330466c59a43c329cc5be7cbbd9309657..4518ff1c96b8c51608d3f73d15a82bf584a603c8 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,14 +22,14 @@ rand = "*"
 sdl2 = "*"
 
 [features]
-default = ["image", "editor", "logging"]
+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"

diff --git a/README.md b/README.md
index 9be1a310b1af595474c055d6191c836dff1a028e..20c75c05e70e9ed2d4dff847aea4e9262d92fb33 100644 (file)
--- a/README.md
+++ b/README.md
@@ -11,10 +11,12 @@ I wrote this demo to learn Rust & basic GLSL. Mind the mess.
 ## Requirements
 
 The native binary requires OpenGL 3.1. Should perform well on reasonably modern
-hardware. Tested on Linux with Intel HD Graphics 4000 (Ivy Bridge) and NVidia GTX 970.
-
-The asmjs and WebAssembly versions were tested on Chromium 57 and Firefox 53.
+hardware. Tested on:
 
+ * Linux with NVidia GTX 970 (Mesa 17.1 Nouveau driver)
+ * Linux with Intel HD Graphics 4000 (Ivy Bridge)
+ * Windows 10 with NVidia GTX 970
+ * The asmjs and WebAssembly build works on Chromium 57 and Firefox 53
 
 ## Building from source
 
@@ -23,6 +25,9 @@ The asmjs and WebAssembly versions were tested on Chromium 57 and Firefox 53.
 Install cargo (either your distro's packaged version or via rustup), then go to the source root and type:
 
 ```
+cd mandelwow
+git submodule init
+git submodule update
 cargo run --release
 ```