From 00731eb01122be18589e7241a0d2e713c4e793aa Mon Sep 17 00:00:00 2001 From: Frank Praznik Date: Wed, 23 Nov 2022 23:11:25 -0500 Subject: [PATCH] wayland: Fix build when not using the shared Wayland libraries Explicitly include the Wayland protocol headers when statically linking against the Wayland libraries or older system headers might be used instead of the local versions. (cherry picked from commit 836eb224428aca3bdab2a6bf56d347262e475b15) --- src/video/wayland/SDL_waylanddyn.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h index 12341e16f..887c51d1c 100644 --- a/src/video/wayland/SDL_waylanddyn.h +++ b/src/video/wayland/SDL_waylanddyn.h @@ -166,6 +166,13 @@ void SDL_WAYLAND_UnloadSymbols(void); #else /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */ +/* + * These must be included before libdecor.h, otherwise the libdecor header + * pulls in the system Wayland protocol headers instead of ours. + */ +#include "wayland-client-protocol.h" +#include "wayland-egl.h" + #ifdef HAVE_LIBDECOR_H #include #endif