diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2024-11-11 11:30:41 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2024-11-18 18:34:29 +0100 |
| commit | b4f8135d4692e8fd85e38f37e42bf4de2dca9391 (patch) | |
| tree | 99c9ac16ce35d88d6a0d8cba42f855df5b859612 /platform/web | |
| parent | fd4c29a189e53a1e085df5b9b9a05cac9351b3ef (diff) | |
| download | redot-engine-b4f8135d4692e8fd85e38f37e42bf4de2dca9391.tar.gz | |
[Web] Fix Web Editor plugin being added to SCons multiple times
Move the Web Editor plugin files to an editor sub-folder inside the
platform folder.
Diffstat (limited to 'platform/web')
| -rw-r--r-- | platform/web/SCsub | 4 | ||||
| -rw-r--r-- | platform/web/api/api.cpp | 2 | ||||
| -rw-r--r-- | platform/web/editor/web_tools_editor_plugin.cpp (renamed from platform/web/api/web_tools_editor_plugin.cpp) | 4 | ||||
| -rw-r--r-- | platform/web/editor/web_tools_editor_plugin.h (renamed from platform/web/api/web_tools_editor_plugin.h) | 4 | ||||
| -rw-r--r-- | platform/web/web_main.cpp | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/platform/web/SCsub b/platform/web/SCsub index b30bf20f26..a85fbcd0f5 100644 --- a/platform/web/SCsub +++ b/platform/web/SCsub @@ -27,9 +27,11 @@ web_files = [ "javascript_bridge_singleton.cpp", "web_main.cpp", "os_web.cpp", - "api/web_tools_editor_plugin.cpp", ] +if env["target"] == "editor": + env.add_source_files(web_files, "editor/*.cpp") + sys_env = env.Clone() sys_env.AddJSLibraries( [ diff --git a/platform/web/api/api.cpp b/platform/web/api/api.cpp index 40417bde7e..f9c1f0fd91 100644 --- a/platform/web/api/api.cpp +++ b/platform/web/api/api.cpp @@ -31,14 +31,12 @@ #include "api.h" #include "javascript_bridge_singleton.h" -#include "web_tools_editor_plugin.h" #include "core/config/engine.h" static JavaScriptBridge *javascript_bridge_singleton; void register_web_api() { - WebToolsEditorPlugin::initialize(); GDREGISTER_ABSTRACT_CLASS(JavaScriptObject); GDREGISTER_ABSTRACT_CLASS(JavaScriptBridge); javascript_bridge_singleton = memnew(JavaScriptBridge); diff --git a/platform/web/api/web_tools_editor_plugin.cpp b/platform/web/editor/web_tools_editor_plugin.cpp index 61801372ba..a98d45a49a 100644 --- a/platform/web/api/web_tools_editor_plugin.cpp +++ b/platform/web/editor/web_tools_editor_plugin.cpp @@ -30,8 +30,6 @@ #include "web_tools_editor_plugin.h" -#if defined(TOOLS_ENABLED) && defined(WEB_ENABLED) - #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/io/dir_access.h" @@ -155,5 +153,3 @@ void WebToolsEditorPlugin::_zip_recursive(String p_path, String p_base_path, zip cur = dir->get_next(); } } - -#endif // TOOLS_ENABLED && WEB_ENABLED diff --git a/platform/web/api/web_tools_editor_plugin.h b/platform/web/editor/web_tools_editor_plugin.h index 2902f60f24..70b47ab49c 100644 --- a/platform/web/api/web_tools_editor_plugin.h +++ b/platform/web/editor/web_tools_editor_plugin.h @@ -31,8 +31,6 @@ #ifndef WEB_TOOLS_EDITOR_PLUGIN_H #define WEB_TOOLS_EDITOR_PLUGIN_H -#if defined(TOOLS_ENABLED) && defined(WEB_ENABLED) - #include "core/io/zip_io.h" #include "editor/plugins/editor_plugin.h" @@ -57,6 +55,4 @@ public: static void initialize() {} }; -#endif // TOOLS_ENABLED && WEB_ENABLED - #endif // WEB_TOOLS_EDITOR_PLUGIN_H diff --git a/platform/web/web_main.cpp b/platform/web/web_main.cpp index d0c3bd7c0e..3487ed2ded 100644 --- a/platform/web/web_main.cpp +++ b/platform/web/web_main.cpp @@ -38,6 +38,10 @@ #include "scene/main/scene_tree.h" #include "scene/main/window.h" // SceneTree only forward declares it. +#ifdef TOOLS_ENABLED +#include "editor/web_tools_editor_plugin.h" +#endif + #include <emscripten/emscripten.h> #include <stdlib.h> @@ -104,6 +108,10 @@ void main_loop_callback() { extern EMSCRIPTEN_KEEPALIVE int godot_web_main(int argc, char *argv[]) { os = new OS_Web(); +#ifdef TOOLS_ENABLED + WebToolsEditorPlugin::initialize(); +#endif + // We must override main when testing is enabled TEST_MAIN_OVERRIDE |