godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Style: Harmonize header includes in platform ports

Browse Source 
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.
This commit is contained in:
Rémi Verschelde
2023-06-08 14:51:32 +02:00
parent 2985a9ac34
commit 9e4315bb50
116 changed files with 372 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/android/plugin/godot_plugin_jni.cpp
View File

@@ -30,12 +30,13 @@
#include "godot_plugin_jni.h"
#include <core/config/engine.h>
#include <core/config/project_settings.h>
#include <core/error/error_macros.h>
#include <platform/android/api/jni_singleton.h>
#include <platform/android/jni_utils.h>
#include <platform/android/string_android.h>
#include "api/jni_singleton.h"
#include "jni_utils.h"
#include "string_android.h"
#include "core/config/engine.h"
#include "core/config/project_settings.h"
#include "core/error/error_macros.h"
static HashMap<String, JNISingleton *> jni_singletons;