diff options
| author | reduz <reduzio@gmail.com> | 2020-11-07 19:33:38 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2020-11-07 20:17:12 -0300 |
| commit | 127458ed175c5aeac8dee7f09d23fae4c8928eb7 (patch) | |
| tree | a1dd3ae46bf575cb8296df38568dfce237c6ecd8 /platform/android/plugin | |
| parent | 30b6db99a99a94c64d906c1b828ff44f79a1bc75 (diff) | |
| download | redot-engine-127458ed175c5aeac8dee7f09d23fae4c8928eb7.tar.gz | |
Reorganized core/ directory, it was too fatty already
-Removed FuncRef, since Callable makes it obsolete
-Removed int_types.h as its obsolete in c++11+
-Changed color names code
Diffstat (limited to 'platform/android/plugin')
| -rw-r--r-- | platform/android/plugin/godot_plugin_config.h | 4 | ||||
| -rw-r--r-- | platform/android/plugin/godot_plugin_jni.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/plugin/godot_plugin_config.h b/platform/android/plugin/godot_plugin_config.h index ea3c7b4f55..ecb9c0c7f5 100644 --- a/platform/android/plugin/godot_plugin_config.h +++ b/platform/android/plugin/godot_plugin_config.h @@ -31,9 +31,9 @@ #ifndef GODOT_PLUGIN_CONFIG_H #define GODOT_PLUGIN_CONFIG_H -#include "core/error_list.h" +#include "core/error/error_list.h" #include "core/io/config_file.h" -#include "core/ustring.h" +#include "core/string/ustring.h" static const char *PLUGIN_CONFIG_EXT = ".gdap"; diff --git a/platform/android/plugin/godot_plugin_jni.cpp b/platform/android/plugin/godot_plugin_jni.cpp index d2528bebeb..b8e5345b85 100644 --- a/platform/android/plugin/godot_plugin_jni.cpp +++ b/platform/android/plugin/godot_plugin_jni.cpp @@ -30,9 +30,9 @@ #include "godot_plugin_jni.h" -#include <core/engine.h> -#include <core/error_macros.h> -#include <core/project_settings.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> |