Merge branch 'develop' into fix/RxRyImplementation

kryptnostic · Mar 24, 2016 · 4802701 · 4802701
2 parents 87b1f9e + 5eb30a0
commit 4802701
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.../src/main/cpp/buildKryptnosticClientJS.sh → krypto-lib/src/main/cpp/buildKryptoJS.sh b/.../src/main/cpp/buildKryptnosticClientJS.sh → krypto-lib/src/main/cpp/buildKryptoJS.sh
@@ -1,8 +1,8 @@
 # usage: buildKryptnosticEngineJS.sh
 FLAGS_PRE="-o"
 FLAGS_POST="--bind -std=c++11 -O3 --memory-init-file 0 -s TOTAL_STACK=10000000 -s DEMANGLE_SUPPORT=1 -ftemplate-depth=8192"
-EMSCRIPTEN="$EMSCRIPTEN_HOME/emscripten/tag-1.34.11/em++"
+EMSCRIPTEN="$EMSCRIPTEN_HOME/emscripten/1.35.0/em++"
 CPP_FILE="client/KryptnosticClientGetter.cpp"
-JS_FILE="$KRYPTO_JS_HOME/KryptnosticClient.js"
+JS_FILE="$KRYPTO_JS_HOME/krypto.js"
 CMD="$EMSCRIPTEN $FLAGS_PRE $JS_FILE $FLAGS_POST $CPP_FILE"
 eval $CMD