-
-
Notifications
You must be signed in to change notification settings - Fork 21.4k
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
Conversation
wayland=yes use_sowrap=no
d69a9df
to
8ca144a
Compare
There was a problem hiding this 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
:
godot/platform/linuxbsd/wayland/wayland_thread.h
Lines 38 to 47 in b7feebe
#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>
8ca144a
to
f06dd46
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, good catch!
Thanks! And congrats for your first merged Godot contribution 🎉 |
Enables building with
wayland=yes use_sowrap=no
.If
opengl3=no
then this change is not required.