From abb8d8e8ca75b8aaa614f768bebed41ad88ff39f Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Mon, 25 Jan 2021 16:24:26 +0100 Subject: [HTML5] Fix "initial_memory" build option parsing --- platform/javascript/detect.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 0d57f8aad1..d8e3c61798 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -51,8 +51,11 @@ def get_flags(): def configure(env): if not isinstance(env["initial_memory"], int): - print("Initial memory must be a valid integer") - sys.exit(255) + try: + env["initial_memory"] = int(env["initial_memory"]) + except: + print("Initial memory must be a valid integer") + sys.exit(255) ## Build type -- cgit v1.2.3 From 4e0945340739bb9d1a8fdf30dfff12a7650c86a1 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Mon, 25 Jan 2021 04:48:11 +0100 Subject: [HTML5] Better editor HTML, small refactor. Side and GDNative libraries are now added by engine.js , the dynlink pre js had been deleted. --- platform/javascript/detect.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'platform/javascript/detect.py') diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index d8e3c61798..76683da947 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -1,7 +1,14 @@ import os import sys -from emscripten_helpers import run_closure_compiler, create_engine_file, add_js_libraries, add_js_pre, add_js_externs +from emscripten_helpers import ( + run_closure_compiler, + create_engine_file, + add_js_libraries, + add_js_pre, + add_js_externs, + get_build_version, +) from methods import get_compiler_version from SCons.Util import WhereIs @@ -58,7 +65,6 @@ def configure(env): sys.exit(255) ## Build type - if env["target"] == "release": # Use -Os to prioritize optimizing for reduced file size. This is # particularly valuable for the web platform because it directly @@ -142,6 +148,9 @@ def configure(env): env.AddMethod(add_js_pre, "AddJSPre") env.AddMethod(add_js_externs, "AddJSExterns") + # Add method for getting build version string. + env.AddMethod(get_build_version, "GetBuildVersion") + # Add method that joins/compiles our Engine files. env.AddMethod(create_engine_file, "CreateEngineFile") -- cgit v1.2.3