X Tutup
Skip to content

Misc cleanup in EditorExportPlatform#110248

Merged
Repiteo merged 1 commit intogodotengine:masterfrom
KoBeWi:unexpected_include_hell
Nov 4, 2025
Merged

Misc cleanup in EditorExportPlatform#110248
Repiteo merged 1 commit intogodotengine:masterfrom
KoBeWi:unexpected_include_hell

Conversation

@KoBeWi
Copy link
Member

@KoBeWi KoBeWi commented Sep 4, 2025

  • Replaced repetitive code in EditorExportPlatform with a helper method
  • Replaced macro with constexpr
  • Cleaned up includes
    • This also required changes in other files

@KoBeWi KoBeWi added this to the 4.x milestone Sep 4, 2025
@KoBeWi KoBeWi requested review from a team as code owners September 4, 2025 11:21
@KoBeWi KoBeWi requested review from a team as code owners September 4, 2025 11:21
@KoBeWi KoBeWi requested a review from a team September 4, 2025 11:21
@KoBeWi KoBeWi force-pushed the unexpected_include_hell branch from 1f1ee21 to 1708ffc Compare September 4, 2025 12:10
Copy link
Member

@Calinou Calinou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good to me.

@KoBeWi KoBeWi force-pushed the unexpected_include_hell branch from 1708ffc to 1d23d4d Compare September 4, 2025 14:36
@Repiteo Repiteo modified the milestones: 4.x, 4.6 Sep 10, 2025
@Repiteo
Copy link
Contributor

Repiteo commented Oct 24, 2025

Needs rebase

@KoBeWi KoBeWi force-pushed the unexpected_include_hell branch from 1d23d4d to 0a4f401 Compare October 25, 2025 11:29
@Repiteo
Copy link
Contributor

Repiteo commented Oct 27, 2025

Oop, looks like include order got unsorted:

index ecc4798..72f33f9 100644
--- a/editor/export/editor_export_preset.cpp
+++ b/editor/export/editor_export_preset.cpp
@@ -31,8 +31,8 @@
 #include "editor_export.h"
 
 #include "core/config/project_settings.h"
-#include "editor/settings/editor_settings.h"
 #include "core/io/dir_access.h"
+#include "editor/settings/editor_settings.h"
 
 bool EditorExportPreset::_set(const StringName &p_name, const Variant &p_value) {
 	values[p_name] = p_value;

Fixing that should make CI pass

@KoBeWi KoBeWi force-pushed the unexpected_include_hell branch from 0a4f401 to 024559c Compare October 27, 2025 17:21
@Repiteo
Copy link
Contributor

Repiteo commented Oct 27, 2025

Shoot, now it looks like the DisplayServer enums are no longer declared for gradle_export_util.h. Including servers/display/display_server.h will clear that up, and hopefully that's the last blocker 😅

@KoBeWi KoBeWi force-pushed the unexpected_include_hell branch from 024559c to 3756758 Compare October 29, 2025 13:30
Copy link
Contributor

@Repiteo Repiteo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙃

@KoBeWi KoBeWi force-pushed the unexpected_include_hell branch from 3756758 to 90dd171 Compare October 29, 2025 19:12
@KoBeWi KoBeWi force-pushed the unexpected_include_hell branch from 90dd171 to 1c1c320 Compare October 29, 2025 21:25
@Repiteo Repiteo merged commit 90cab74 into godotengine:master Nov 4, 2025
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Nov 4, 2025

Thanks!

@KoBeWi KoBeWi deleted the unexpected_include_hell branch November 4, 2025 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

X Tutup