diff options
| -rw-r--r-- | modules/gdnative/gdnative_library_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | platform/javascript/SCsub | 1 | ||||
| -rw-r--r-- | platform/javascript/export/export.cpp | 6 | ||||
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 16 |
4 files changed, 22 insertions, 3 deletions
diff --git a/modules/gdnative/gdnative_library_editor_plugin.cpp b/modules/gdnative/gdnative_library_editor_plugin.cpp index 9a3b73077f..719fcbc927 100644 --- a/modules/gdnative/gdnative_library_editor_plugin.cpp +++ b/modules/gdnative/gdnative_library_editor_plugin.cpp @@ -310,7 +310,7 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() { NativePlatformConfig platform_html5; platform_html5.name = "HTML5"; - platform_html5.entries.push_back("web"); + platform_html5.entries.push_back("wasm32"); platform_html5.library_extension = "*.wasm"; platforms["HTML5"] = platform_html5; diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub index 3501e17c6c..59f3dce3ad 100644 --- a/platform/javascript/SCsub +++ b/platform/javascript/SCsub @@ -52,6 +52,7 @@ if env["gdnative_enabled"]: # The side library, containing all Godot code. wasm_env = env.Clone() + wasm_env.Append(CPPDEFINES=["WASM_GDNATIVE"]) # So that OS knows it can run GDNative libraries. wasm_env.Append(CCFLAGS=["-s", "SIDE_MODULE=2"]) wasm_env.Append(LINKFLAGS=["-s", "SIDE_MODULE=2"]) wasm = wasm_env.add_program("#bin/godot.side${PROGSUFFIX}.wasm", javascript_files) diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 017ba77231..f77bf6ab97 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -330,6 +330,12 @@ void EditorExportPlatformJavaScript::get_preset_features(const Ref<EditorExportP r_features->push_back("etc2"); } } + ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type"); + if (mode == EXPORT_MODE_THREADS) { + r_features->push_back("threads"); + } else if (mode == EXPORT_MODE_GDNATIVE) { + r_features->push_back("wasm32"); + } } void EditorExportPlatformJavaScript::get_export_options(List<ExportOption> *r_options) { diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index b3ef3fe573..ebfcd7293e 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -128,12 +128,24 @@ int OS_JavaScript::get_process_id() const { } bool OS_JavaScript::_check_internal_feature_support(const String &p_feature) { - if (p_feature == "HTML5" || p_feature == "web") + if (p_feature == "HTML5" || p_feature == "web") { return true; + } #ifdef JAVASCRIPT_EVAL_ENABLED - if (p_feature == "JavaScript") + if (p_feature == "JavaScript") { + return true; + } +#endif +#ifndef NO_THREADS + if (p_feature == "threads") { return true; + } +#endif +#if WASM_GDNATIVE + if (p_feature == "wasm32") { + return true; + } #endif return false; |