diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-04-20 13:35:53 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-04-20 13:35:53 +0200 |
| commit | 7ec6f96d9c53f23e9137a2deea2cbf71f959534e (patch) | |
| tree | 9026b2aed8decf9542500f0d44cfbce8fdbbe17c /src | |
| parent | d2bd3c62408945227bb13133ad6ce270851b4872 (diff) | |
Add "fl_" prefix to libdecor symbols when using the built-in copy of libdecor
This allows client apps to use other versions of libdecor if they wish,
just like what FLTK already does with libpng and libjpeg.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dfbdfa235..2770e9b47 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -575,6 +575,11 @@ if(FLTK_BACKEND_WAYLAND) COMPILE_OPTIONS "${COPTS}" ) endif(USE_SYSTEM_LIBDECOR) + set_source_files_properties( + ${FLTK_SOURCE_DIR}/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx + ${FLTK_SOURCE_DIR}/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx + PROPERTIES COMPILE_DEFINITIONS "USE_SYSTEM_LIBDECOR=${USE_SYSTEM_LIBDECOR}" + ) list(APPEND CFILES scandir_posix.c diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx index 60011393d..92e9530b9 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx @@ -18,7 +18,7 @@ #include "Fl_Wayland_Window_Driver.H" #include "Fl_Wayland_Graphics_Driver.H" #include <wayland-cursor.h> -#include "../../../libdecor/src/libdecor.h" +#include "../../../libdecor/build/fl_libdecor.h" #include "xdg-shell-client-protocol.h" #include "../Posix/Fl_Posix_System_Driver.H" #include <FL/Fl.H> diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index ff1682e31..e1b5b0b7a 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -20,7 +20,7 @@ #include "Fl_Wayland_Graphics_Driver.H" #include <FL/filename.H> #include <wayland-cursor.h> -#include "../../../libdecor/src/libdecor.h" +#include "../../../libdecor/build/fl_libdecor.h" #include "xdg-shell-client-protocol.h" #include <pango/pangocairo.h> #include <FL/Fl_Overlay_Window.H> |