diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-19 11:28:22 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-20 13:16:37 +0200 |
| commit | 90446fe9f381eaaa86caed2facc09ee1cf5fb52b (patch) | |
| tree | 85267ecf27753199491359ba31bbeb00507758be /platform | |
| parent | dbe8712d4eda555829283624df7c79faa4bc02ea (diff) | |
| download | redot-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')
26 files changed, 12 insertions, 40 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 20aced3524..2860898e5c 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -9,10 +9,6 @@ if TYPE_CHECKING: from SCons import Environment -def is_active(): - return True - - def get_name(): return "Android" diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index cb82091073..5d31c4911c 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -30,9 +30,9 @@ #include "export_plugin.h" -#include "../logo_svg.gen.h" -#include "../run_icon_svg.gen.h" #include "gradle_export_util.h" +#include "logo_svg.gen.h" +#include "run_icon_svg.gen.h" #include "core/config/project_settings.h" #include "core/io/dir_access.h" diff --git a/platform/android/logo.svg b/platform/android/export/logo.svg index f154e55d11..f154e55d11 100644 --- a/platform/android/logo.svg +++ b/platform/android/export/logo.svg diff --git a/platform/android/run_icon.svg b/platform/android/export/run_icon.svg index 24d930fece..24d930fece 100644 --- a/platform/android/run_icon.svg +++ b/platform/android/export/run_icon.svg diff --git a/platform/ios/detect.py b/platform/ios/detect.py index bab055dbd5..f5501e3d85 100644 --- a/platform/ios/detect.py +++ b/platform/ios/detect.py @@ -8,10 +8,6 @@ if TYPE_CHECKING: from SCons import Environment -def is_active(): - return True - - def get_name(): return "iOS" diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index 9962a48250..1b9b02d0e0 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -30,7 +30,7 @@ #include "export_plugin.h" -#include "../logo_svg.gen.h" +#include "logo_svg.gen.h" #include "core/string/translation.h" #include "editor/editor_node.h" diff --git a/platform/ios/logo.svg b/platform/ios/export/logo.svg index 47a72bcf49..47a72bcf49 100644 --- a/platform/ios/logo.svg +++ b/platform/ios/export/logo.svg diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index dadc03685b..9faa73d6d2 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -10,10 +10,6 @@ if TYPE_CHECKING: from SCons import Environment -def is_active(): - return True - - def get_name(): return "LinuxBSD" diff --git a/platform/linuxbsd/export/export_plugin.cpp b/platform/linuxbsd/export/export_plugin.cpp index 082040c8d6..f74bdf3516 100644 --- a/platform/linuxbsd/export/export_plugin.cpp +++ b/platform/linuxbsd/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_node.h" diff --git a/platform/linuxbsd/logo.svg b/platform/linuxbsd/export/logo.svg index e5f9f03e0c..e5f9f03e0c 100644 --- a/platform/linuxbsd/logo.svg +++ b/platform/linuxbsd/export/logo.svg diff --git a/platform/linuxbsd/run_icon.svg b/platform/linuxbsd/export/run_icon.svg index 56465a0df3..56465a0df3 100644 --- a/platform/linuxbsd/run_icon.svg +++ b/platform/linuxbsd/export/run_icon.svg diff --git a/platform/macos/detect.py b/platform/macos/detect.py index 7b8d3fd853..21e824b2d3 100644 --- a/platform/macos/detect.py +++ b/platform/macos/detect.py @@ -9,10 +9,6 @@ if TYPE_CHECKING: from SCons import Environment -def is_active(): - return True - - def get_name(): return "macOS" diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp index 6aef43dd8b..2d185db812 100644 --- a/platform/macos/export/export_plugin.cpp +++ b/platform/macos/export/export_plugin.cpp @@ -30,11 +30,11 @@ #include "export_plugin.h" -#include "../logo_svg.gen.h" -#include "../run_icon_svg.gen.h" #include "codesign.h" #include "lipo.h" +#include "logo_svg.gen.h" #include "macho.h" +#include "run_icon_svg.gen.h" #include "core/io/image_loader.h" #include "core/string/translation.h" diff --git a/platform/macos/logo.svg b/platform/macos/export/logo.svg index 759583d76b..759583d76b 100644 --- a/platform/macos/logo.svg +++ b/platform/macos/export/logo.svg diff --git a/platform/macos/run_icon.svg b/platform/macos/export/run_icon.svg index c7067bb4b6..c7067bb4b6 100644 --- a/platform/macos/run_icon.svg +++ b/platform/macos/export/run_icon.svg diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index 03c4fd547e..604f5e48e3 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -9,10 +9,6 @@ if TYPE_CHECKING: from SCons import Environment -def is_active(): - return True - - def get_name(): return "UWP" diff --git a/platform/uwp/export/export_plugin.cpp b/platform/uwp/export/export_plugin.cpp index a0a91a1cf1..0332fbf718 100644 --- a/platform/uwp/export/export_plugin.cpp +++ b/platform/uwp/export/export_plugin.cpp @@ -30,7 +30,7 @@ #include "export_plugin.h" -#include "../logo_svg.gen.h" +#include "logo_svg.gen.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" diff --git a/platform/uwp/logo.svg b/platform/uwp/export/logo.svg index 5bcbdcfcd4..5bcbdcfcd4 100644 --- a/platform/uwp/logo.svg +++ b/platform/uwp/export/logo.svg 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 diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 3a6ca66449..bec1fd2cb6 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -13,10 +13,6 @@ if TYPE_CHECKING: STACK_SIZE = 8388608 -def is_active(): - return True - - def get_name(): return "Windows" diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp index 367b471196..b521a649be 100644 --- a/platform/windows/export/export_plugin.cpp +++ b/platform/windows/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 "core/io/image_loader.h" diff --git a/platform/windows/logo.svg b/platform/windows/export/logo.svg index 77a0b20766..77a0b20766 100644 --- a/platform/windows/logo.svg +++ b/platform/windows/export/logo.svg diff --git a/platform/windows/run_icon.svg b/platform/windows/export/run_icon.svg index 0897276ef7..0897276ef7 100644 --- a/platform/windows/run_icon.svg +++ b/platform/windows/export/run_icon.svg |
