Upgraded to emscripten 1.38.11

finos · Aug 29, 2018 · 8087a4c · 8087a4c
1 parent 1405e1c
commit 8087a4c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/docker/emsdk/Dockerfile b/docker/emsdk/Dockerfile
@@ -1,6 +1,6 @@
 # Liberally copied from trzeci/emscripten
 
-ARG EMSCRIPTEN_SDK=sdk-tag-1.38.4-64bit
+ARG EMSCRIPTEN_SDK=sdk-tag-1.38.11-64bit
 FROM trzeci/emscripten-slim:${EMSCRIPTEN_SDK}
 
 # ------------------------------------------------------------------------------

diff --git a/packages/perspective/CMakeLists.txt b/packages/perspective/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories("/boost_includes")
 
 set(EXTENDED_FLAGS " \
 	--bind \
-	--memory-init-file 1 \
+	--memory-init-file 0 \
 	-s NO_EXIT_RUNTIME=1 \
 	-s NO_FILESYSTEM=1 \
 	-s ALLOW_MEMORY_GROWTH=1 \
@@ -42,9 +42,9 @@ else()
 	")
 endif()
 
-set(SYNC_MODE_FLAGS "-s BINARYEN_ASYNC_COMPILATION=0 -s BINARYEN_METHOD='\"native-wasm\"' -s WASM=1")
-set(ASYNC_MODE_FLAGS "-s BINARYEN_ASYNC_COMPILATION=1 -s BINARYEN_METHOD='\"native-wasm\"' -s WASM=1")
-set(ASMJS_MODE_FLAGS "-s BINARYEN_ASYNC_COMPILATION=0 -s BINARYEN_METHOD='\"asmjs\"' -Wno-almost-asm -s WASM=0")
+set(SYNC_MODE_FLAGS "-s ENVIRONMENT=node -s BINARYEN_ASYNC_COMPILATION=0 -s BINARYEN_METHOD='\"native-wasm\"' -s WASM=1")
+set(ASYNC_MODE_FLAGS "-s ENVIRONMENT=worker -s BINARYEN_ASYNC_COMPILATION=1 -s BINARYEN_METHOD='\"native-wasm\"' -s WASM=1")
+set(ASMJS_MODE_FLAGS "-s ENVIRONMENT=worker -s LEGACY_VM_SUPPORT=1 -s BINARYEN_ASYNC_COMPILATION=0 -s BINARYEN_METHOD='\"asmjs\"' -Wno-almost-asm -s WASM=0")
 
 set(CMAKE_C_FLAGS " \
 	${CMAKE_C_FLAGS} \

diff --git a/packages/perspective/src/js/perspective.asmjs.js b/packages/perspective/src/js/perspective.asmjs.js
@@ -13,7 +13,6 @@ const perspective = require('./perspective.js');
 if (global.document !== undefined) {
 	const Module = load_perspective({
 		wasmJSMethod: "asmjs",
-		locateFile: path => `asmjs/${path}`,
         filePackagePrefixURL: "",
 	    printErr: (x) => console.error(x),
 	    print: (x) => console.warn(x)

diff --git a/packages/perspective/src/js/perspective.wasm.js b/packages/perspective/src/js/perspective.wasm.js
@@ -13,7 +13,6 @@ const perspective = require('./perspective.js');
 if (global.document !== undefined && typeof WebAssembly !== 'undefined') {
 	module.exports = perspective(load_perspective({
 		wasmJSMethod: "native-wasm",
-		locateFile: path => `wasm_async/${path}`,
 		filePackagePrefixURL: "",
 		printErr: (x) => console.error(x),
 		print: (x) => console.warn(x)

diff --git a/packages/perspective/test/js/perspective.spec.js b/packages/perspective/test/js/perspective.spec.js
@@ -8,17 +8,11 @@
  */
 
 const perspective = require('../../src/js/perspective.js');
-const load_asmjs = require("../../build/asmjs/psp.js").load_perspective;
+const asmjs_perspective = require("../../src/js/perspective.asmjs.js");
 const node_perspective = require("../../src/js/perspective.node.js");
 
 const RUNTIMES = {
-    ASMJS: perspective(load_asmjs({
-        wasmJSMethod: "asmjs",
-        locateFile: path => `build/asmjs/${path}`,
-        filePackagePrefixURL: "asmjs/",
-        asmjsCodeFile: "asmjs/psp.js",
-        ENVIRONMENT: "NODE"
-    })),
+    ASMJS: asmjs_perspective,
     NODE: node_perspective
 }