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/osx | |
| parent | 30b6db99a99a94c64d906c1b828ff44f79a1bc75 (diff) | |
| parent | 127458ed175c5aeac8dee7f09d23fae4c8928eb7 (diff) | |
Merge pull request #43385 from reduz/reorganize-core
Reorganize and clean up core/ directory
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/context_gl_osx.h | 2 | ||||
| -rw-r--r-- | platform/osx/crash_handler_osx.mm | 2 | ||||
| -rw-r--r-- | platform/osx/export/export.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/platform/osx/context_gl_osx.h b/platform/osx/context_gl_osx.h index cce00fb35f..1d467513e2 100644 --- a/platform/osx/context_gl_osx.h +++ b/platform/osx/context_gl_osx.h @@ -33,7 +33,7 @@ #if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) -#include "core/error_list.h" +#include "core/error/error_list.h" #include "core/os/os.h" #include <AppKit/AppKit.h> diff --git a/platform/osx/crash_handler_osx.mm b/platform/osx/crash_handler_osx.mm index 9fb2f63935..1429024598 100644 --- a/platform/osx/crash_handler_osx.mm +++ b/platform/osx/crash_handler_osx.mm @@ -30,8 +30,8 @@ #include "crash_handler_osx.h" +#include "core/config/project_settings.h" #include "core/os/os.h" -#include "core/project_settings.h" #include "main/main.h" #include <string.h> diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index 9f2160dd9e..e988e51e72 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -30,13 +30,13 @@ #include "export.h" +#include "core/config/project_settings.h" #include "core/io/marshalls.h" #include "core/io/resource_saver.h" #include "core/io/zip_io.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "core/project_settings.h" #include "core/version.h" #include "editor/editor_export.h" #include "editor/editor_node.h" |