diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-12-01 14:43:32 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-12-02 09:28:08 +0100 |
| commit | f72748bb4563c07322846ae92cc9c02c0b448e5b (patch) | |
| tree | f1810fa604d181fc018249eb3fd0a0742650548d /libdecor/build | |
| parent | 96730f80cbc3b2d5aec2967a61f16bb2f02853e6 (diff) | |
Wayland: make OPTION_USE_SYSTEM_LIBDECOR ON by default
This commit makes the default FLTK build setting use libdecor
as packaged in Linux when the build system contains packages
libdecor-0-dev and libdecor-0-plugin-1-gtk in version ≥ 0.2.0.
Otherwise, FLTK uses the bundled version of libdecor.
This includes situations where package libdecor-0-dev is
present in an earlier version.
Diffstat (limited to 'libdecor/build')
| -rw-r--r-- | libdecor/build/Makefile | 6 | ||||
| -rw-r--r-- | libdecor/build/fl_libdecor.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libdecor/build/Makefile b/libdecor/build/Makefile index 946ec6318..c98f12ddb 100644 --- a/libdecor/build/Makefile +++ b/libdecor/build/Makefile @@ -27,7 +27,7 @@ FreeBSD_CFLAGS = -I/usr/local/include EXTRA_DECOR = ${${UNAME}_CFLAGS} CFLAGS_DECOR = -I. -I../.. -I../../src -I../src -I../src/plugins $(EXTRA_DECOR) -fPIC -D_GNU_SOURCE \ - -DUSE_SYSTEM_LIBDECOR=0 -DHAVE_MEMFD_CREATE -DHAVE_MKOSTEMP -DHAVE_POSIX_FALLOCATE + -DHAVE_MEMFD_CREATE -DHAVE_MKOSTEMP -DHAVE_POSIX_FALLOCATE Linux_NOPIE = -no-pie FreeBSD_NOPIE = @@ -39,10 +39,10 @@ depend: : echo "libdecor/build: make depend..." fl_libdecor.o : fl_libdecor.c ../src/libdecor.c ../../src/xdg-shell-protocol.c ../../src/xdg-decoration-protocol.c ../../src/text-input-protocol.c ../../src/gtk-shell-protocol.c - $(CC) $(CFLAGS) $(CFLAGS_DECOR) -c fl_libdecor.c -DLIBDECOR_PLUGIN_API_VERSION=1 -DLIBDECOR_PLUGIN_DIR=\"\" + $(CC) $(CFLAGS) $(CFLAGS_DECOR) -c fl_libdecor.c -DLIBDECOR_PLUGIN_API_VERSION=1 fl_libdecor-plugins.o : fl_libdecor-plugins.c ../src/plugins/cairo/libdecor-cairo.c - $(CC) $(CFLAGS) $(CFLAGS_DECOR) -c fl_libdecor-plugins.c -DLIBDECOR_PLUGIN_API_VERSION=1 -DLIBDECOR_PLUGIN_DIR=\"\" + $(CC) $(CFLAGS) $(CFLAGS_DECOR) -c fl_libdecor-plugins.c -DLIBDECOR_PLUGIN_API_VERSION=1 libdecor-cairo-blur.o : ../src/plugins/common/libdecor-cairo-blur.c $(CC) $(CFLAGS_DECOR) -c ../src/plugins/common/libdecor-cairo-blur.c diff --git a/libdecor/build/fl_libdecor.c b/libdecor/build/fl_libdecor.c index ab6cee5c2..7a327f151 100644 --- a/libdecor/build/fl_libdecor.c +++ b/libdecor/build/fl_libdecor.c @@ -15,6 +15,7 @@ // /* Improvements to libdecor.c without modifying libdecor.c itself */ +#if ! USE_SYSTEM_LIBDECOR #include "xdg-shell-client-protocol.h" #ifdef XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION @@ -126,3 +127,5 @@ LIBDECOR_EXPORT struct libdecor *libdecor_new(struct wl_display *wl_display, str wl_display_flush(wl_display); return context; } + +#endif //! USE_SYSTEM_LIBDECOR |