Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation of the editors when using SDL1 #945

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

th-otto
Copy link
Contributor

@th-otto th-otto commented Mar 16, 2024

SHIFT-HOME and HOME have the same values for SDL1; use CTRL-HOME instead

@th-otto
Copy link
Contributor Author

th-otto commented Mar 16, 2024

Hm, build fails in the clang format check, but the lines that are marked (https://github.com/TheAssemblyArmada/Vanilla-Conquer/actions/runs/8308506496/job/22740736584#step:7:810) are not touched by the patch?

@OmniBlade
Copy link
Contributor

Looks like the added ifdef is confusing clang-format? Maybe add a line break after the comment block and see if that makes it happy?

@th-otto
Copy link
Contributor Author

th-otto commented Mar 19, 2024

Nope, didn't work.

@th-otto
Copy link
Contributor Author

th-otto commented Mar 19, 2024

But moving the block inside the ifdef worked. I guess clang-format wants the comment to be aligned with the case label, and got confused by the preprocessor statement.

SHIFT-HOME and HOME have the same values for SDL1; use CTRL-HOME instead
@OmniBlade OmniBlade merged commit 61196b3 into TheAssemblyArmada:vanilla Mar 20, 2024
10 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