Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 04:17:33 +00:00
Code Issues Releases Activity

build x11-color.cc for any GUI, not just wayland

Browse Source 
we should actually build this for ncurses and html backends too, not just GUI ones
This commit is contained in:
bi4k8 2023-02-05 06:40:14 +00:00 committed by Brenden Matthews
parent 9ab51edf9f
commit 9b2706fc49
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -244,12 +244,12 @@ if(BUILD_X11)
endif(BUILD_X11) endif(BUILD_X11)
if(BUILD_GUI) 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}) set(optional_sources ${optional_sources} ${gui})
endif(BUILD_GUI) endif(BUILD_GUI)
if(BUILD_WAYLAND) 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}) set(optional_sources ${optional_sources} ${wl_srcs})
# generate protocol implementations # generate protocol implementations
set(XDG_PROT_DEF "${Wayland_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml") set(XDG_PROT_DEF "${Wayland_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml")

4
src/colours.cc
View File

@ -32,9 +32,9 @@
#ifdef BUILD_X11 #ifdef BUILD_X11
#include "x11.h" #include "x11.h"
#endif /*BUILD_X11*/ #endif /*BUILD_X11*/
#ifdef BUILD_WAYLAND #ifdef BUILD_GUI
#include "x11-color.h" #include "x11-color.h"
#endif /*BUILD_WAYLAND*/ #endif /*BUILD_GUI*/
#ifdef BUILD_NCURSES #ifdef BUILD_NCURSES
#include <ncurses.h> #include <ncurses.h>
#endif /*BUILD_NCURSES*/ #endif /*BUILD_NCURSES*/