diff options
| author | Marek Vasut <marex@denx.de> | 2022-10-29 14:46:41 +0300 |
|---|---|---|
| committer | Fabio Estevam <festevam@denx.de> | 2022-10-29 16:30:37 +0300 |
| commit | 5dc5d3809b110feea6c25a1b0044db9e64af0830 (patch) | |
| tree | d91be327c29c1af2eb4ead998b4b94716046f22b /src | |
| parent | 91a8d9c40fa3618ae4ca7dbead79dba56b38cb1d (diff) | |
remmina: Allow building on a Wayland-only environment
Currently, it is not possible to build remmina without x11
support.
Implement the necessary changes to support building and running
remmina on a Wayland-only environment.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Fabio Estevam <festevam@denx.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/rcw.c | 4 | ||||
| -rw-r--r-- | src/remmina.c | 4 | ||||
| -rw-r--r-- | src/remmina_plugin_manager.c | 6 | ||||
| -rw-r--r-- | src/remmina_plugin_native.c | 4 | ||||
| -rw-r--r-- | src/remmina_public.c | 2 |
6 files changed, 18 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb1fec2e0..f9e880f7c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -171,10 +171,6 @@ if(WITH_MANPAGES) install(FILES remmina.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1) endif() -find_package(X11) -include_directories(${X11_INCLUDE_DIR}) -target_link_libraries(remmina ${X11_LIBRARIES}) - target_link_libraries(remmina ${CMAKE_THREAD_LIBS_INIT}) if(Intl_FOUND) @@ -37,7 +37,11 @@ #include "config.h" +#ifdef GDK_WINDOWING_X11 #include <cairo/cairo-xlib.h> +#else +#include <cairo/cairo.h> +#endif #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> diff --git a/src/remmina.c b/src/remmina.c index abc4a3144..2156bff30 100644 --- a/src/remmina.c +++ b/src/remmina.c @@ -36,7 +36,11 @@ #ifndef G_LOG_DOMAIN #define G_LOG_DOMAIN ((gchar*)"remmina") #endif /* G_LOG_DOMAIN */ +#ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> +#else +#include <gdk/gdkwayland.h> +#endif #include <gio/gio.h> #include <glib/gi18n.h> #include <stdlib.h> diff --git a/src/remmina_plugin_manager.c b/src/remmina_plugin_manager.c index b9d5ee167..47af6536a 100644 --- a/src/remmina_plugin_manager.c +++ b/src/remmina_plugin_manager.c @@ -42,9 +42,11 @@ #include <gmodule.h> #include <gio/gio.h> #include <string.h> - +#ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> - +#else +#include <gdk/gdkwayland.h> +#endif #include "remmina_public.h" #include "remmina_main.h" #include "remmina_file_manager.h" diff --git a/src/remmina_plugin_native.c b/src/remmina_plugin_native.c index 9961d5641..6e844fef1 100644 --- a/src/remmina_plugin_native.c +++ b/src/remmina_plugin_native.c @@ -39,7 +39,11 @@ #include <gio/gio.h> #include <string.h> +#ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> +#else +#include <gdk/gdkwayland.h> +#endif #include "remmina_public.h" #include "remmina_file_manager.h" diff --git a/src/remmina_public.c b/src/remmina_public.c index 5c5c4640d..e20030dd7 100644 --- a/src/remmina_public.c +++ b/src/remmina_public.c @@ -55,6 +55,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> +#else +#include <gdk/gdkwayland.h> #endif #include "remmina_public.h" #include "remmina/remmina_trace_calls.h" |