Skip to content

Fix includes so that include sorting in clangformat doesn't break anything - #748

Merged
mcarans merged 1 commit into
OoliteProject:masterfrom
mcarans:fix_includes
Sep 23, 2026
Merged

mcarans merged 1 commit into
OoliteProject:masterfrom
mcarans:fix_includes

Conversation

@mcarans

@mcarans mcarans commented Sep 21, 2026 •

Copy link
Copy Markdown
Contributor
  • Fix includes so that include sorting in clang-format doesn't break anything (prior to running clang-format on code)
  • Use #pragma once with correct include hierarchy to avoid multiple inclusion of same headers instead of INCLUDED_OOMATHS_h define workaround
  • Also we always use OOMATHS_OPENGL_INTEGRATION and !OOMATHS_STANDALONE so remove defines and just have that code always be compiled.
  • Remove MacOS non-SDL ifdef in OOOpenGLOnly.h

In my testing with this fix, Oolite compiled and ran successfully before and after running clang-format. Without it, there are compile errors after clang-format due to things not being included correctly.

@mcarans

mcarans commented Sep 23, 2026

Copy link
Copy Markdown
Contributor Author

@phkb Does this work for you?

@phkb

phkb commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

All good from me.

@mcarans
mcarans merged commit 0a8207e into OoliteProject:master Sep 23, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants