summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-10-31 22:32:19 -0700
committerAlon Zakai <alonzakai@gmail.com>2015-10-31 22:32:19 -0700
commitd8e4d241890263569bef12d706a1133dc594e7b7 (patch)
tree652797858dd6b5ce6c460a8ea9d8f1373baf26fe
parentb44b5f10b462f70a220a2b5ff435455419d39077 (diff)
downloadbinaryen-d8e4d241890263569bef12d706a1133dc594e7b7.tar.gz
binaryen-d8e4d241890263569bef12d706a1133dc594e7b7.tar.bz2
binaryen-d8e4d241890263569bef12d706a1133dc594e7b7.zip
update readme
-rw-r--r--README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index cb2a62242..f5be31196 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,8 @@ More specifically, this repository contains:
$ ./build.sh
```
-`asm2wasm` requires a C++11 compiler. `wasm.js` requires Emscripten (which you can [get here](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html)).
+* `asm2wasm` requires a C++11 compiler. If you also want to compile C/C++ to asm.js and then to WebAssembly, you'll need Emscripten (the [stable SDK (or normal manual install)](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html) is fine).
+* `wasm.js` requires Emscripten, using the `asm2wasm` branch in the main repo and `incoming` branches in the `fastcomp` and `fastcomp-clang` repos (the stable SDK, which is enough for `asm2wasm`, is not enough for `wasm.js`).
## Running