summaryrefslogtreecommitdiffstats
path: root/platform/web
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-06-19 11:28:22 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-06-20 13:16:37 +0200
commit90446fe9f381eaaa86caed2facc09ee1cf5fb52b (patch)
tree85267ecf27753199491359ba31bbeb00507758be /platform/web
parentdbe8712d4eda555829283624df7c79faa4bc02ea (diff)
downloadredot-engine-90446fe9f381eaaa86caed2facc09ee1cf5fb52b.tar.gz
SCons: Move platform logo/run icon to `export` folder
Follow-up to #75932. Since these icons are only used by the export plugin, it makes sense to move them and generate the headers there. The whole `detect.is_active()` logic seems to be a leftover from before times, as far back as 1.0-stable it already wasn't used for anything. So I'm removing it and moving the export icon generation to `platform_methods`, where it makes more sense.
Diffstat (limited to 'platform/web')
-rw-r--r--platform/web/detect.py4
-rw-r--r--platform/web/export/export_plugin.cpp4
-rw-r--r--platform/web/export/logo.svg (renamed from platform/web/logo.svg)0
-rw-r--r--platform/web/export/run_icon.svg (renamed from platform/web/run_icon.svg)0
4 files changed, 2 insertions, 6 deletions
diff --git a/platform/web/detect.py b/platform/web/detect.py
index 419d8918f2..2685cbcd63 100644
--- a/platform/web/detect.py
+++ b/platform/web/detect.py
@@ -17,10 +17,6 @@ if TYPE_CHECKING:
from SCons import Environment
-def is_active():
- return True
-
-
def get_name():
return "Web"
diff --git a/platform/web/export/export_plugin.cpp b/platform/web/export/export_plugin.cpp
index e3cdd6a60d..0bc3b92f09 100644
--- a/platform/web/export/export_plugin.cpp
+++ b/platform/web/export/export_plugin.cpp
@@ -30,8 +30,8 @@
#include "export_plugin.h"
-#include "../logo_svg.gen.h"
-#include "../run_icon_svg.gen.h"
+#include "logo_svg.gen.h"
+#include "run_icon_svg.gen.h"
#include "core/config/project_settings.h"
#include "editor/editor_scale.h"
diff --git a/platform/web/logo.svg b/platform/web/export/logo.svg
index 567b6f3c77..567b6f3c77 100644
--- a/platform/web/logo.svg
+++ b/platform/web/export/logo.svg
diff --git a/platform/web/run_icon.svg b/platform/web/export/run_icon.svg
index 494f53cb90..494f53cb90 100644
--- a/platform/web/run_icon.svg
+++ b/platform/web/export/run_icon.svg