Skip to content

fix build after commit 2c4e6ed3585ec63adee2e9a680de3c52b4db3c0c:#15588

Merged
sezero merged 1 commit into
libsdl-org:mainfrom
sezero:no-gdk
May 14, 2026
Merged

fix build after commit 2c4e6ed3585ec63adee2e9a680de3c52b4db3c0c:#15588
sezero merged 1 commit into
libsdl-org:mainfrom
sezero:no-gdk

Conversation

@sezero
Copy link
Copy Markdown
Contributor

@sezero sezero commented May 14, 2026

move SDL_UsingGameInputForXInputControllers() to core/windows/SDL_gameinput.cpp
because joystick/gdk/SDL_gameinputjoystick.cpp isn't always added to build.

  • I confirm that I am the author of this code and release it to the SDL project under the Zlib license. This contribution does not contain code from other sources, including code generated by a Large Language Model ("AI").

@sezero sezero requested a review from slouken May 14, 2026 19:14
Comment thread src/core/windows/SDL_gameinput.h
move SDL_UsingGameInputForXInputControllers() to core/windows/SDL_gameinput.cpp
because joystick/gdk/SDL_gameinputjoystick.cpp isn't always added to build.
@sezero sezero merged commit 4d95a63 into libsdl-org:main May 14, 2026
45 of 46 checks passed
@sezero sezero deleted the no-gdk branch May 14, 2026 20:11
@madebr
Copy link
Copy Markdown
Contributor

madebr commented May 14, 2026

The build fails now when gameinput is enabled: gameinput.h is c++-only, so SDL_gameinput.h cannot be included by C sources.

https://github.com/madebr/SDL/actions/runs/25883714844/job/76070246194#step:32:263

@sezero
Copy link
Copy Markdown
Contributor Author

sezero commented May 14, 2026

The build fails now when gameinput is enabled: gameinput.h is c++-only, so SDL_gameinput.h cannot be included by C sources.

Ugh.. Well, one lazy solution would be inserting an #undef HAVE_GAMEINPUT_H line before including in sources other than gdk/*.cpp

@slouken
Copy link
Copy Markdown
Collaborator

slouken commented May 14, 2026

I'll fix this.

@slouken
Copy link
Copy Markdown
Collaborator

slouken commented May 14, 2026

Fixed in c9bb41b. @madebr, can you rebase your PR and see if it works?

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.

3 participants