From: Bernie Innocenti <bernie@codewiz.org>
Date: Fri, 7 Jul 2017 15:03:59 +0000 (-0400)
Subject: Disable Rocket in the default build and update build instructions.
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=27be0f236daaac0df31e9b90726430615ae41ff5;p=mandelwow.git

Disable Rocket in the default build and update build instructions.
---

diff --git a/Cargo.toml b/Cargo.toml
index f327b65..4518ff1 100644
--- 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 9be1a31..20c75c0 100644
--- 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
 ```