Wayland: Fix build config with so_wrap disabled
#102673
Merged
Conversation
This file contains 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
We should only include the vendored headers for Wayland and libdecor-0 when we use `so_wrap`, i.e. when we *don't* build against system libraries. The libdecor-0 pkg-config file includes the `libdecor-0/` prefix already, so its header should be included without it, and likewise in our so wrappers. Fixes godotengine#102671.
akien-mga
commented
Feb 10, 2025
|
|
||
| if env["libdecor"]: | ||
| env.Append(CPPDEFINES=["LIBDECOR_ENABLED"]) | ||
|
|
||
| env.Prepend(CPPPATH=["#platform/linuxbsd", "#thirdparty/linuxbsd_headers/wayland/"]) |
There was a problem hiding this comment.
The #platform/linubsd was redundant, it's already included earlier.
Riteo
approved these changes
Feb 10, 2025
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.
We should only include the vendored headers for Wayland and libdecor-0 when we use
so_wrap, i.e. when we don't build against system libraries.The libdecor-0 pkg-config file includes the
libdecor-0/prefix already, so its header should be included without it, and likewise in our so wrappers. Fixes #102671.Didn't test much, CC @ArchercatNEO.