diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-12 10:37:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 10:37:23 +0200 |
| commit | 5bd0ff003fdd82cf84a557251633ebb83bad4fd5 (patch) | |
| tree | 248dc6dfca0e27c3b03533b45753a16d186d2811 /modules/gdnative/pluginscript | |
| parent | cc71012266f880dcf3b37e40d5f90d9ce8b7a432 (diff) | |
| parent | 277b24dfb7acdb42589b931252bbe7be81c7536e (diff) | |
Merge pull request #21978 from akien-mga/include-core-absolute
Make core/ includes absolute, remove subfolders from include path
Diffstat (limited to 'modules/gdnative/pluginscript')
| -rw-r--r-- | modules/gdnative/pluginscript/pluginscript_loader.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/pluginscript/pluginscript_loader.h | 4 | ||||
| -rw-r--r-- | modules/gdnative/pluginscript/register_types.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/gdnative/pluginscript/pluginscript_loader.cpp b/modules/gdnative/pluginscript/pluginscript_loader.cpp index acba297fa0..52d5b2b595 100644 --- a/modules/gdnative/pluginscript/pluginscript_loader.cpp +++ b/modules/gdnative/pluginscript/pluginscript_loader.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ // Godot imports -#include "os/file_access.h" +#include "core/os/file_access.h" // Pythonscript imports #include "pluginscript_language.h" #include "pluginscript_loader.h" diff --git a/modules/gdnative/pluginscript/pluginscript_loader.h b/modules/gdnative/pluginscript/pluginscript_loader.h index 9276ea3ef9..5c17bb932e 100644 --- a/modules/gdnative/pluginscript/pluginscript_loader.h +++ b/modules/gdnative/pluginscript/pluginscript_loader.h @@ -32,9 +32,9 @@ #define PYTHONSCRIPT_PY_LOADER_H // Godot imports +#include "core/io/resource_loader.h" +#include "core/io/resource_saver.h" #include "core/script_language.h" -#include "io/resource_loader.h" -#include "io/resource_saver.h" class PluginScriptLanguage; diff --git a/modules/gdnative/pluginscript/register_types.cpp b/modules/gdnative/pluginscript/register_types.cpp index 924abf29df..e677bc9867 100644 --- a/modules/gdnative/pluginscript/register_types.cpp +++ b/modules/gdnative/pluginscript/register_types.cpp @@ -30,11 +30,11 @@ #include "register_types.h" +#include "core/io/resource_loader.h" +#include "core/io/resource_saver.h" +#include "core/os/dir_access.h" +#include "core/os/os.h" #include "core/project_settings.h" -#include "io/resource_loader.h" -#include "io/resource_saver.h" -#include "os/dir_access.h" -#include "os/os.h" #include "scene/main/scene_tree.h" #include "pluginscript_language.h" |