Use regular -I include flag for SDL paths
#17475
Merged
Conversation
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
dschuff
approved these changes
Jul 19, 2022
Member
dschuff
left a comment
dschuff
left a comment
There was a problem hiding this comment.
what's the difference between the 2 sdl-config examples in the commit description?
Collaborator
Author
|
One is for SDL2 and one is for SDL (v1) |
sbc100
force-pushed
the
sdl_includes
branch
3 times, most recently
from
2228cf7 to
c63cf8f
Compare
Collaborator
Author
|
I had to do a little more refactoring to prevent clang from warning about passing |
sbc100
added a commit
that referenced
this pull request
Jul 20, 2022
I noticed that we lacked such a thing while working on #17475. It turns out that system header are technically allowed to redefine macros without generating a warning, but when I made the SDL header tree into a normal `-I` path I noticed that `M_PI` was being duplicately defined because we were not defining `HAVE_M_PI`. This list of defines is taked from `SDL_config_iphoneos.h` and a visual inspection seems to confirm that we do indeed support all the specified features.
sbc100
added a commit
that referenced
this pull request
Jul 20, 2022
I noticed that we lacked such a thing while working on #17475. It turns out that system header are technically allowed to redefine macros without generating a warning, but when I made the SDL header tree into a normal `-I` path I noticed that `M_PI` was being duplicately defined because we were not defining `HAVE_M_PI`. This list of defines is taked from `SDL_config_iphoneos.h` and a visual inspection seems to confirm that we do indeed support all the specified features.
sbc100
added a commit
that referenced
this pull request
Jul 20, 2022
I noticed that we lacked such a thing while working on #17475. It turns out that system header are technically allowed to redefine macros without generating a warning, but when I made the SDL header tree into a normal `-I` path I noticed that `M_PI` was being duplicately defined because we were not defining `HAVE_M_PI`. This list of defines is taked from `SDL_config_iphoneos.h` and a visual inspection seems to confirm that we do indeed support all the specified features.
dschuff
approved these changes
Jul 21, 2022
emcc.py
Outdated
| flags += ['-mllvm', a] | ||
|
|
||
| # relaxed-simd implies simd128. | ||
| if '-mrelaxed-simd' in user_args: |
Member
There was a problem hiding this comment.
unrelated to this change, but what's the difference between flags and user_args?
Collaborator
Author
There was a problem hiding this comment.
user_args is what was supplied on the command line but the user. flags is the flags we are generating to pass to clang.
It does looks like the line below is doing the wrong thing here.. but its not related to this change. I will investigate separately.
sbc100
added a commit
that referenced
this pull request
Jul 21, 2022
I noticed that we lacked such a thing while working on #17475. It turns out that system header are technically allowed to redefine macros without generating a warning, but when I made the SDL header tree into a normal `-I` path I noticed that `M_PI` was being duplicately defined because we were not defining `HAVE_M_PI`. This list of defines is taked from `SDL_config_iphoneos.h` and a visual inspection seems to confirm that we do indeed support all the specified features.
sbc100
added a commit
that referenced
this pull request
Jul 21, 2022
I noticed that we lacked such a thing while working on #17475. It turns out that system header are technically allowed to redefine macros without generating a warning, but when I made the SDL header tree into a normal `-I` path I noticed that `M_PI` was being duplicately defined because we were not defining `HAVE_M_PI`. This list of defines is taked from `SDL_config_iphoneos.h` and a visual inspection seems to confirm that we do indeed support all the specified features.
sbc100
added a commit
that referenced
this pull request
Jul 21, 2022
I noticed that we lacked such a thing while working on #17475. It turns out that system header are technically allowed to redefine macros without generating a warning, but when I made the SDL header tree into a normal `-I` path I noticed that `M_PI` was being duplicately defined because we were not defining `HAVE_M_PI`. This list of defines is taked from `SDL_config_iphoneos.h` and a visual inspection seems to confirm that we do indeed support all the specified features.
sbc100
added a commit
that referenced
this pull request
Jul 22, 2022
I noticed that we lacked such a thing while working on #17475. It turns out that system header are technically allowed to redefine macros without generating a warning, but when I made the SDL header tree into a normal `-I` path I noticed that `M_PI` was being duplicately defined because we were not defining `HAVE_M_PI`. This list of defines is taken from `SDL_config_iphoneos.h` and a visual inspection seems to confirm that we do indeed support all the specified features.
When SDL it used on the desktop the SDL include paths are injected in this way: ``` $ sdl-config --cflags -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT $ sdl2-config --cflags -I/usr/include/SDL2 -D_REENTRANT ``` Its also the way to add include paths for all the other ports. As part of this I also refactored the generation of C flags such that we don't pass `-I` flags when building `.i`/`.ii` files. These files are considered to be already pre-processed and clang warns if you pass `-I` flags when compiling them.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When SDL it used on the desktop the SDL include paths are injected
in this way:
Its also the way to add include paths for all the other ports.