diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-08 10:41:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 10:41:17 +0100 |
| commit | 90edd839d5f67d4252923a720feeef6ad0d76107 (patch) | |
| tree | a1dd3ae46bf575cb8296df38568dfce237c6ecd8 /platform/javascript | |
| parent | 30b6db99a99a94c64d906c1b828ff44f79a1bc75 (diff) | |
| parent | 127458ed175c5aeac8dee7f09d23fae4c8928eb7 (diff) | |
Merge pull request #43385 from reduz/reorganize-core
Reorganize and clean up core/ directory
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/api/api.cpp | 2 | ||||
| -rw-r--r-- | platform/javascript/api/javascript_eval.h | 2 | ||||
| -rw-r--r-- | platform/javascript/api/javascript_tools_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | platform/javascript/audio_driver_javascript.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/platform/javascript/api/api.cpp b/platform/javascript/api/api.cpp index aa0206d144..6fd6c0ddf1 100644 --- a/platform/javascript/api/api.cpp +++ b/platform/javascript/api/api.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "api.h" -#include "core/engine.h" +#include "core/config/engine.h" #include "javascript_eval.h" #include "javascript_tools_editor_plugin.h" diff --git a/platform/javascript/api/javascript_eval.h b/platform/javascript/api/javascript_eval.h index 26b5b9e484..389983077e 100644 --- a/platform/javascript/api/javascript_eval.h +++ b/platform/javascript/api/javascript_eval.h @@ -31,7 +31,7 @@ #ifndef JAVASCRIPT_EVAL_H #define JAVASCRIPT_EVAL_H -#include "core/class_db.h" +#include "core/object/class_db.h" class JavaScript : public Object { private: diff --git a/platform/javascript/api/javascript_tools_editor_plugin.cpp b/platform/javascript/api/javascript_tools_editor_plugin.cpp index e487bf23b7..d44e8139a1 100644 --- a/platform/javascript/api/javascript_tools_editor_plugin.cpp +++ b/platform/javascript/api/javascript_tools_editor_plugin.cpp @@ -31,10 +31,10 @@ #if defined(TOOLS_ENABLED) && defined(JAVASCRIPT_ENABLED) #include "javascript_tools_editor_plugin.h" -#include "core/engine.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" -#include "core/project_settings.h" #include "editor/editor_node.h" #include <emscripten/emscripten.h> diff --git a/platform/javascript/audio_driver_javascript.cpp b/platform/javascript/audio_driver_javascript.cpp index 006552a188..ab6ed54cc8 100644 --- a/platform/javascript/audio_driver_javascript.cpp +++ b/platform/javascript/audio_driver_javascript.cpp @@ -30,7 +30,7 @@ #include "audio_driver_javascript.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "godot_audio.h" #include <emscripten.h> |