diff --git a/DesktopEditor/xmlsec/src/wasm/oform_plugin/main.cpp b/DesktopEditor/xmlsec/src/wasm/oform_plugin/main.cpp index dfa561713e..12f47c54d0 100644 --- a/DesktopEditor/xmlsec/src/wasm/oform_plugin/main.cpp +++ b/DesktopEditor/xmlsec/src/wasm/oform_plugin/main.cpp @@ -1,5 +1,5 @@ #include "../../../../common/File.h" -#include "../../../../../3dParty/openssl/common/common_openssl.h" +#include "../../../../../Common/3dParty/openssl/common/common_openssl.h" #ifndef DISABLE_XMLSEC #include "../../include/Certificate.h" diff --git a/DesktopEditor/xmlsec/src/wasm/oform_plugin/module/before.py b/DesktopEditor/xmlsec/src/wasm/oform_plugin/module/before.py index bcc71a2dcc..999e563661 100644 --- a/DesktopEditor/xmlsec/src/wasm/oform_plugin/module/before.py +++ b/DesktopEditor/xmlsec/src/wasm/oform_plugin/module/before.py @@ -34,5 +34,5 @@ if not base.is_file("./openssl/libcrypto.a"): base.print_info("Compile openssl...") os.chdir("./openssl") #run_as_bash("./compile_openssl.sh", ["./config no-shared no-asm no-ssl2 no-ssl3", "source ./../emsdk/emsdk_env.sh", "export CC=emcc", "export CXX=emcc", "make"]) - run_as_bash("./compile_openssl.sh", ["source ./../../../../../../Common/js/emsdk/emsdk_env.sh", "emconfigure ./config no-shared no-asm no-threads", "sed -i 's|^CROSS_COMPILE.*$|CROSS_COMPILE=|g' Makefile", "emmake make build_generated libssl.a libcrypto.a"]) + run_as_bash("./compile_openssl.sh", ["source ./../../../../../../../Common/js/emsdk/emsdk_env.sh", "emconfigure ./config no-shared no-asm no-threads", "sed -i 's|^CROSS_COMPILE.*$|CROSS_COMPILE=|g' Makefile", "emmake make build_generated libssl.a libcrypto.a"]) os.chdir("../") diff --git a/DesktopEditor/xmlsec/src/wasm/oform_plugin/module/engine.json b/DesktopEditor/xmlsec/src/wasm/oform_plugin/module/engine.json index 63bea47431..14580ac96a 100644 --- a/DesktopEditor/xmlsec/src/wasm/oform_plugin/module/engine.json +++ b/DesktopEditor/xmlsec/src/wasm/oform_plugin/module/engine.json @@ -2,10 +2,11 @@ "name": "engine", "res_folder": "./deploy", "wasm": true, - "asm": false, + "asm": true, + "embed_mem_file": true, "run_before": "before.py", "run_after": "after.py", - "base_js_content": "./engine.js", + "base_js_content": "./engine_base.js", "compiler_flags": [ "-O3",