diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-04-22 08:00:00 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-04-22 08:00:00 +0200 |
| commit | 8e21120f75a0d791ce6f1cc26445f1978ed8875d (patch) | |
| tree | ab419d38af2360d72c383870128d473a8e9699a6 | |
| parent | 8b1d6053f95c05503252f8ae151e1635a5571548 (diff) | |
Restore use of CMake OPTION_USE_SYSTEM_LIBDECOR
| -rw-r--r-- | libdecor/build/fl_libdecor-plugins.c | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libdecor/build/fl_libdecor-plugins.c b/libdecor/build/fl_libdecor-plugins.c index ff8d5a101..317f2a03e 100644 --- a/libdecor/build/fl_libdecor-plugins.c +++ b/libdecor/build/fl_libdecor-plugins.c @@ -25,11 +25,14 @@ #include <dlfcn.h> #include <string.h> #include "../src/libdecor.h" -#include "xdg-decoration-client-protocol.h" #include <pango/pangocairo.h> #if USE_SYSTEM_LIBDECOR #include "../src/libdecor-plugin.h" +enum zxdg_toplevel_decoration_v1_mode { + ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE = 1, + ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE = 2, +}; enum component {NONE}; enum decoration_type {DECORATION_TYPE_NONE}; @@ -50,6 +53,8 @@ struct buffer { // identical in libdecor-cairo.c and libdecor-gtk.c #else // !USE_SYSTEM_LIBDECOR +# include "xdg-decoration-client-protocol.h" + const struct libdecor_plugin_description *fl_libdecor_plugin_description = NULL; # ifdef HAVE_GTK diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 75f72a6d3..815070c6a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -479,12 +479,12 @@ if (OPTION_USE_WAYLAND) xutf8/keysym2Ucs.c scandir_posix.c ../libdecor/src/cursor-settings.c + ../libdecor/src/os-compatibility.c ../libdecor/build/fl_libdecor-plugins.c ) if (NOT OPTION_USE_SYSTEM_LIBDECOR) list (APPEND CFILES ../libdecor/build/fl_libdecor.c - ../libdecor/src/os-compatibility.c ../libdecor/src/plugins/cairo/libdecor-cairo-blur.c ) endif (NOT OPTION_USE_SYSTEM_LIBDECOR) |