Update wasm targets for emcc 1.37.22

Currently, the main loop seems to get stuck, needs some debugging.

diff --git a/debug_wasm.sh b/debug_wasm.sh
index cb4f144e372b2246b5c9f9b4371932d3412cf7c4..b9bbad9fb8001c868ea8fd7f6baa2ae777bc7865 100755 (executable)
--- a/debug_wasm.sh
+++ b/debug_wasm.sh
@@ -1,5 +1,7 @@
 set -e
-cargo rustc --target asmjs-unknown-emscripten -- -C link-args='-s USE_SDL=2 --preload-file flora.xm'
-cp -a target/asmjs-unknown-emscripten/debug/mandelwow.js .
-cp -a target/asmjs-unknown-emscripten/debug/deps/mandelwow-*.data .
+export CFLAGS="-g"
+export CXXFLAGS="$CFLAGS"
+cargo rustc --target wasm32-unknown-emscripten --bin mandelwow -- -C link-args='-s USE_SDL=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 .

diff --git a/release_wasm.sh b/release_wasm.sh
index f3016b0907ccb1e1cefcf9d752a06d4bf1077389..5738e2ac32cd54bdb25a43d590e16ea50fe50c26 100755 (executable)
--- a/release_wasm.sh
+++ b/release_wasm.sh
@@ -1,7 +1,8 @@
 set -e
 export CFLAGS="-O2"
 export CXXFLAGS="$CFLAGS"
+#cargo rustc --target wasm32-unknown-emscripten --release --bin mandelwow -- -C link-args='-s USE_WEBGL2=1 -s USE_SDL=2 --preload-file flora.xm'
 cargo rustc --target wasm32-unknown-emscripten --release --bin mandelwow -- -C link-args='-s USE_SDL=2 --preload-file flora.xm'
-cp -a target/wasm32-unknown-emscripten/release/mandelwow.js .
-cp -a target/wasm32-unknown-emscripten/release/deps/mandelwow-*.{wasm,data} .
+cp -a target/wasm32-unknown-emscripten/release/mandelwow.{js,wasm} .
+cp -a target/wasm32-unknown-emscripten/release/deps/mandelwow.data .
 emrun .