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

Linux: Enable build config wayland=yes use_sowrap=no #92324

Merged
merged 1 commit into from
May 28, 2024

Conversation

jwinarske
Copy link
Contributor

Enables building with wayland=yes use_sowrap=no.

If opengl3=no then this change is not required.

@jwinarske jwinarske requested a review from a team as a code owner May 24, 2024 17:05
@akien-mga akien-mga changed the title Enable build config wayland=yes use_sowrap=no Linux: Enable build config wayland=yes use_sowrap=no May 24, 2024
@akien-mga akien-mga added this to the 4.3 milestone May 24, 2024
@akien-mga akien-mga requested a review from a team May 24, 2024 17:20
@jwinarske jwinarske force-pushed the jw/wayland_sowrap branch 2 times, most recently from d69a9df to 8ca144a Compare May 24, 2024 23:48
Copy link
Contributor

@Riteo Riteo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution!

This include is indeed missing, but please note that the whole wrap/no-wrap include block is in platform/linux/wayland/wayland_thread.h:

#ifdef SOWRAP_ENABLED
#include "wayland/dynwrappers/wayland-client-core-so_wrap.h"
#include "wayland/dynwrappers/wayland-cursor-so_wrap.h"
#include "wayland/dynwrappers/wayland-egl-core-so_wrap.h"
#include "xkbcommon-so_wrap.h"
#else
#include <wayland-client-core.h>
#include <wayland-cursor.h>
#include <xkbcommon/xkbcommon.h>
#endif // SOWRAP_ENABLED

So, I think that it would be wiser (or at least more consistent) to put it there, in the else branch, between the xkbcommon and cursor include, so that we have two mirrored blocks.

(It took me a bit to find where the other includes came for so I understand that it's not very intuitive, sorry)

-wayland-egl.h was missing if opengl3=yes (default)

Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
@jwinarske jwinarske force-pushed the jw/wayland_sowrap branch from 8ca144a to f06dd46 Compare May 25, 2024 14:19
@jwinarske jwinarske requested a review from Riteo May 25, 2024 14:20
Copy link
Contributor

@Riteo Riteo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, good catch!

@akien-mga akien-mga merged commit 981ac9b into godotengine:master May 28, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

@jwinarske jwinarske deleted the jw/wayland_sowrap branch May 28, 2024 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants