Fix fakesdl headers when SDL directory included#26279
Open
sbc100 wants to merge 1 commit intoemscripten-core:mainfrom
Open
Fix fakesdl headers when SDL directory included#26279sbc100 wants to merge 1 commit intoemscripten-core:mainfrom
sbc100 wants to merge 1 commit intoemscripten-core:mainfrom
Conversation
sbc100
force-pushed
the
fakesdl
branch
6 times, most recently
from
68118fa to
78d0c59
Compare
kripken
reviewed
Feb 17, 2026
sbc100
force-pushed
the
fakesdl
branch
3 times, most recently
from
f2c7b97 to
b3077d6
Compare
Collaborator
Author
|
I added a ChangeLog entry to be extra clear what is changing here. |
We introduced the `fakesdl` headers back in emscripten-core#18443 so that anyone trying to use SDL without using `-sUSE_SDL` (or similar) would see an error. However we only covered the `SDL_xx.h` include case not the `SDL/SDL_xx.h` use case. This means that some users were not seeing the errors they should, including a few of our test cases. Split out from emscripten-core#26275
kripken
reviewed
Feb 26, 2026
| // | ||
| // - 0, the default, means no SDL headers or libraries will be used. | ||
| // - 1 is a port of SDL 1.3, implemented in JS. | ||
| // - 2 and 3 are upstream ports build from the official SDL codebase. |
Member
There was a problem hiding this comment.
Suggested change
| // - 2 and 3 are upstream ports build from the official SDL codebase. | |
| // - 2 and 3 are upstream ports built from the official SDL codebase. |
| self.skipTest('This test requires being run in non-strict mode (EMCC_STRICT env. variable unset)') | ||
| # TODO: This test is verifying behavior that will be deprecated at some point in the future, remove this test once | ||
| # system JS libraries are no longer automatically linked to anymore. | ||
| self.reftest('hello_world_sdl.c', 'htmltest.png') |
Collaborator
Author
There was a problem hiding this comment.
This is the exact behavior that I'm removing. i.e. that ability to use SDL headers without -sUSE_SDL.
I'm fixing the TODO here really, and this test should really have been removed in #18443.
Collaborator
Author
There was a problem hiding this comment.
Hmm.. now that I go back and read #18443 it seems like it was deliberately only targeting the unversioned includes.
Member
There was a problem hiding this comment.
Either way, this lgtm. To use SDL, the flag should be needed, like all other ports.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We introduced the
fakesdlheaders back in #18443 so that anyone trying to use SDL without using-sUSE_SDL(or similar) would see an error.However we only covered the
SDL_xx.hinclude case not theSDL/SDL_xx.huse case.This means that some users were not seeing the errors they should, including a few of our test cases.
Split out from #26275