diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-02 03:14:40 -0400 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-02 03:22:12 -0400 |
| commit | a684ee1dec108bb1a050f07ec3dd73fd5ef02dbc (patch) | |
| tree | e9de2ee4820e24a159d2c06b1ace11f89c4e97c4 /platform/web | |
| parent | 3302f803aa4ea09b16a8824ca3bea33f3e2b48ba (diff) | |
| parent | c6c464cf9ae56e8b68620af65125dd980d0e8122 (diff) | |
| download | redot-engine-a684ee1dec108bb1a050f07ec3dd73fd5ef02dbc.tar.gz | |
Merge commit godotengine/godot@c6c464cf9ae56e8b68620af65125dd980d0e8122
Diffstat (limited to 'platform/web')
| -rw-r--r-- | platform/web/display_server_web.cpp | 1 | ||||
| -rw-r--r-- | platform/web/emscripten_helpers.py | 20 |
2 files changed, 4 insertions, 17 deletions
diff --git a/platform/web/display_server_web.cpp b/platform/web/display_server_web.cpp index 0161d95d88..0b013662d1 100644 --- a/platform/web/display_server_web.cpp +++ b/platform/web/display_server_web.cpp @@ -1135,6 +1135,7 @@ bool DisplayServerWeb::has_feature(Feature p_feature) const { //case FEATURE_NATIVE_DIALOG: //case FEATURE_NATIVE_DIALOG_INPUT: //case FEATURE_NATIVE_DIALOG_FILE: + //case FEATURE_NATIVE_DIALOG_FILE_EXTRA: //case FEATURE_NATIVE_ICON: //case FEATURE_WINDOW_TRANSPARENCY: //case FEATURE_KEEP_SCREEN_ON: diff --git a/platform/web/emscripten_helpers.py b/platform/web/emscripten_helpers.py index 8fcabb21c7..3122271a71 100644 --- a/platform/web/emscripten_helpers.py +++ b/platform/web/emscripten_helpers.py @@ -3,6 +3,8 @@ import os from SCons.Util import WhereIs +from platform_methods import get_build_version + def run_closure_compiler(target, source, env, for_signature): closure_bin = os.path.join( @@ -21,22 +23,6 @@ def run_closure_compiler(target, source, env, for_signature): return " ".join(cmd) -def get_build_version(): - import version - - name = "custom_build" - if os.getenv("BUILD_NAME") is not None: - name = os.getenv("BUILD_NAME") - v = "%d.%d" % (version.major, version.minor) - if version.patch > 0: - v += ".%d" % version.patch - status = version.status - if os.getenv("GODOT_VERSION_STATUS") is not None: - status = str(os.getenv("GODOT_VERSION_STATUS")) - v += ".%s.%s" % (status, name) - return v - - def create_engine_file(env, target, source, externs, threads_enabled): if env["use_closure_compiler"]: return env.BuildJS(target, source, JSEXTERNS=externs) @@ -84,7 +70,7 @@ def create_template_zip(env, js, wasm, worker, side): cache.append("godot.editor.worker.js") opt_cache = ["godot.editor.wasm"] subst_dict = { - "___GODOT_VERSION___": get_build_version(), + "___GODOT_VERSION___": get_build_version(False), "___GODOT_NAME___": "GodotEngine", "___GODOT_CACHE___": json.dumps(cache), "___GODOT_OPT_CACHE___": json.dumps(opt_cache), |