summaryrefslogtreecommitdiffstats
path: root/platform/windows/display_server_windows.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-06-08 14:51:32 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-06-08 15:19:19 +0200
commit9e4315bb502659e73b01eb5b40ce1cac10bea2c5 (patch)
tree0ba5196ed22da7782480105116134421412ae10a /platform/windows/display_server_windows.cpp
parent2985a9ac348fc0e08a7906ff36b08985e36ac2a4 (diff)
downloadredot-engine-9e4315bb502659e73b01eb5b40ce1cac10bea2c5.tar.gz
Style: Harmonize header includes in platform ports
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.
Diffstat (limited to 'platform/windows/display_server_windows.cpp')
-rw-r--r--platform/windows/display_server_windows.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index f971846959..dc0a9dabe9 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -30,12 +30,16 @@
#include "display_server_windows.h"
+#include "os_windows.h"
+
#include "core/io/marshalls.h"
-#include "core/math/geometry_2d.h"
#include "main/main.h"
-#include "os_windows.h"
#include "scene/resources/texture.h"
+#if defined(GLES3_ENABLED)
+#include "drivers/gles3/rasterizer_gles3.h"
+#endif
+
#include <avrt.h>
#include <dwmapi.h>
@@ -43,10 +47,6 @@
#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
#endif
-#if defined(GLES3_ENABLED)
-#include "drivers/gles3/rasterizer_gles3.h"
-#endif
-
#if defined(__GNUC__)
// Workaround GCC warning from -Wcast-function-type.
#define GetProcAddress (void *)GetProcAddress