diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-08 14:51:32 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-08 15:19:19 +0200 |
| commit | 9e4315bb502659e73b01eb5b40ce1cac10bea2c5 (patch) | |
| tree | 0ba5196ed22da7782480105116134421412ae10a /platform/ios/export | |
| parent | 2985a9ac348fc0e08a7906ff36b08985e36ac2a4 (diff) | |
| download | redot-engine-9e4315bb502659e73b01eb5b40ce1cac10bea2c5.tar.gz | |
Style: Harmonize header includes in platform ports
This applies our existing style guide, and adds a new rule to that style
guide for modular components such as platform ports and modules:
Includes from the platform port or module should be included with relative
paths (relative to the root folder of the modular component, e.g.
`platform/linuxbsd/`), in their own section before Godot's "core" includes.
The `api` and `export` subfolders also need to be handled as self-contained
(and thus use relative paths for their "local" includes) as they are all
compiled for each editor platform, without necessarily having the api/export
matching platform folder in the include path.
E.g. the Linux editor build will compile `platform/android/{api,export}/*.cpp`
and those need to use relative includes for it to work.
Diffstat (limited to 'platform/ios/export')
| -rw-r--r-- | platform/ios/export/export.cpp | 3 | ||||
| -rw-r--r-- | platform/ios/export/export_plugin.cpp | 3 | ||||
| -rw-r--r-- | platform/ios/export/export_plugin.h | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/platform/ios/export/export.cpp b/platform/ios/export/export.cpp index f4b90d8883..e07a135861 100644 --- a/platform/ios/export/export.cpp +++ b/platform/ios/export/export.cpp @@ -30,9 +30,10 @@ #include "export.h" -#include "editor/export/editor_export.h" #include "export_plugin.h" +#include "editor/export/editor_export.h" + void register_ios_exporter_types() { GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformIOS); } diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index 06741a12e4..ae0d120513 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -30,11 +30,12 @@ #include "export_plugin.h" +#include "../logo_svg.gen.h" + #include "core/string/translation.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/export/editor_export.h" -#include "platform/ios/logo_svg.gen.h" #include "modules/modules_enabled.gen.h" // For svg. #ifdef MODULE_SVG_ENABLED diff --git a/platform/ios/export/export_plugin.h b/platform/ios/export/export_plugin.h index 9afefef121..2e461c8ed6 100644 --- a/platform/ios/export/export_plugin.h +++ b/platform/ios/export/export_plugin.h @@ -31,6 +31,8 @@ #ifndef IOS_EXPORT_PLUGIN_H #define IOS_EXPORT_PLUGIN_H +#include "godot_plugin_config.h" + #include "core/config/project_settings.h" #include "core/io/file_access.h" #include "core/io/image_loader.h" @@ -43,10 +45,8 @@ #include "editor/editor_settings.h" #include "editor/export/editor_export_platform.h" #include "main/splash.gen.h" -#include "string.h" - -#include "godot_plugin_config.h" +#include <string.h> #include <sys/stat.h> // Optional environment variables for defining confidential information. If any |
