From 93d683395f8204b332428e92a1a06e657c477686 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 7 Aug 2018 18:24:27 +0300 Subject: [PATCH 1/2] Remove '*.cmake' pattern from .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 39b08f63..8f21d48f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ *.bc -*.cmake *.dSYM *.done *.final From 8e138b9f14f42f78ec3b40725adb19f97cf8605c Mon Sep 17 00:00:00 2001 From: Ryan Lester Date: Wed, 22 Aug 2018 20:06:32 -0400 Subject: [PATCH 2/2] iOS fix --- dist-build/emscripten.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dist-build/emscripten.sh b/dist-build/emscripten.sh index 093fe17b..62a4b794 100755 --- a/dist-build/emscripten.sh +++ b/dist-build/emscripten.sh @@ -108,12 +108,16 @@ if [ "$DIST" = yes ]; then reject(err); } }; + Module.useBackupModule = function () { + var Module = _Module; + Module.onAbort = undefined; + Module.onRuntimeInitialized = undefined; + Module.useBackupModule = undefined; + $(cat "${PREFIX}/lib/libsodium.asm.tmp.js" | sed 's|use asm||g') + }; $(cat "${PREFIX}/lib/libsodium.wasm.tmp.js") }).catch(function () { - var Module = _Module; - Module.onAbort = undefined; - Module.onRuntimeInitialized = undefined; - $(cat "${PREFIX}/lib/libsodium.asm.tmp.js" | sed 's|use asm||g') + _Module.useBackupModule(); }); EOM