mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore use of CMake OPTION_USE_SYSTEM_LIBDECOR

Browse Source
This commit is contained in:
ManoloFLTK 2022-04-22 08:00:00 +02:00
parent 8b1d6053f9
commit 8e21120f75
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libdecor/build/fl_libdecor-plugins.c
View File

@ -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

2
src/CMakeLists.txt
View File

@ -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)