From e8d5176af12d6ef0c4ce461708f4dbe95db49d2e Mon Sep 17 00:00:00 2001 From: Ryan Lester Date: Wed, 14 Jun 2017 22:04:11 -0400 Subject: [PATCH] minor fixes (#5296) --- emcc.py | 2 +- src/settings.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/emcc.py b/emcc.py index 65abc5737bd05..9b42773adf22e 100755 --- a/emcc.py +++ b/emcc.py @@ -1605,7 +1605,7 @@ def get_final(): with ToolchainProfiler.profile_block('memory initializer'): memfile = None - embed_memfile = (Settings.SINGLE_FILE or shared.Settings.MEM_INIT_METHOD == 0) and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4) + embed_memfile = (shared.Settings.SINGLE_FILE or shared.Settings.MEM_INIT_METHOD == 0) and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4) if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile: memfile = target + '.mem' diff --git a/src/settings.js b/src/settings.js index f0ae35bc5b99a..e3cf7f1ae5fe1 100644 --- a/src/settings.js +++ b/src/settings.js @@ -881,3 +881,6 @@ var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted file var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant var ASMJS_CODE_FILE = ''; // name of the file containing asm.js, if relevant + +var INCLUDE_THIRD_PARTY_SODIUMUTIL = 0; // If set to 1, sodiumutil will be included in the bundle. + // Automatically set as needed, specifically for SINGLE_FILE.