From 9b2706fc4955ca7d213a78e9f11cf7de46f96a93 Mon Sep 17 00:00:00 2001 From: bi4k8 Date: Sun, 5 Feb 2023 06:40:14 +0000 Subject: [PATCH] build x11-color.cc for any GUI, not just wayland we should actually build this for ncurses and html backends too, not just GUI ones --- src/CMakeLists.txt | 4 ++-- src/colours.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8a6d45f..b09a847a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -244,12 +244,12 @@ if(BUILD_X11) endif(BUILD_X11) if(BUILD_GUI) - set(gui fonts.cc fonts.h gui.cc gui.h) + set(gui fonts.cc fonts.h gui.cc gui.h x11-color.cc x11-color.h) set(optional_sources ${optional_sources} ${gui}) endif(BUILD_GUI) if(BUILD_WAYLAND) - set(wl_srcs wl.cc wl.h xdg-shell-protocol.c wlr-layer-shell-protocol.c x11-color.cc x11-color.h) + set(wl_srcs wl.cc wl.h xdg-shell-protocol.c wlr-layer-shell-protocol.c) set(optional_sources ${optional_sources} ${wl_srcs}) # generate protocol implementations set(XDG_PROT_DEF "${Wayland_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml") diff --git a/src/colours.cc b/src/colours.cc index a77d6d70..8f3011c1 100644 --- a/src/colours.cc +++ b/src/colours.cc @@ -32,9 +32,9 @@ #ifdef BUILD_X11 #include "x11.h" #endif /*BUILD_X11*/ -#ifdef BUILD_WAYLAND +#ifdef BUILD_GUI #include "x11-color.h" -#endif /*BUILD_WAYLAND*/ +#endif /*BUILD_GUI*/ #ifdef BUILD_NCURSES #include #endif /*BUILD_NCURSES*/