caskd/bemenu
1
0
Fork 0
forked from RepoMirrors/bemenu
Code Pull Requests Activity

s/cairo/cairo_renderer/ and fix cairo include

Browse Source 
The documented canonical include for cairo is #include <cairo.h>
This commit is contained in:
Jari Vetoniemi 2021-05-07 23:38:15 +09:00
parent c8b4efcd79
commit ebd7338bd5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@ -66,7 +66,7 @@ bemenu-renderer-curses.so: lib/renderers/curses/curses.c
bemenu-renderer-x11.so: private override LDLIBS += $(shell pkg-config --libs x11 xinerama cairo pango pangocairo)
bemenu-renderer-x11.so: private override CPPFLAGS += $(shell pkg-config --cflags-only-I x11 xinerama cairo pango pangocairo)
bemenu-renderer-x11.so: lib/renderers/cairo.h lib/renderers/x11/x11.c lib/renderers/x11/x11.h lib/renderers/x11/window.c lib/renderers/x11/xkb_unicode.c lib/renderers/x11/xkb_unicode.h
bemenu-renderer-x11.so: lib/renderers/cairo_renderer.h lib/renderers/x11/x11.c lib/renderers/x11/x11.h lib/renderers/x11/window.c lib/renderers/x11/xkb_unicode.c lib/renderers/x11/xkb_unicode.h
lib/renderers/wayland/xdg-shell.c:
wayland-scanner private-code < "$$(pkg-config --variable=pkgdatadir wayland-protocols)/stable/xdg-shell/xdg-shell.xml" > $@
@ -91,7 +91,7 @@ xdg-output.a: private override CPPFLAGS += $(shell pkg-config --cflags-only-I wa
xdg-output.a: lib/renderers/wayland/xdg-output-unstable-v1.c lib/renderers/wayland/xdg-output-unstable-v1.h
bemenu-renderer-wayland.so: private override LDLIBS += $(shell pkg-config --libs wayland-client cairo pango pangocairo xkbcommon)
bemenu-renderer-wayland.so: private override CPPFLAGS += $(shell pkg-config --cflags-only-I wayland-client cairo pango pangocairo xkbcommon)
bemenu-renderer-wayland.so: lib/renderers/cairo.h lib/renderers/wayland/wayland.c lib/renderers/wayland/wayland.h lib/renderers/wayland/registry.c lib/renderers/wayland/window.c xdg-shell.a wlr-layer-shell.a xdg-output.a
bemenu-renderer-wayland.so: lib/renderers/cairo_renderer.h lib/renderers/wayland/wayland.c lib/renderers/wayland/wayland.h lib/renderers/wayland/registry.c lib/renderers/wayland/window.c xdg-shell.a wlr-layer-shell.a xdg-output.a
common.a: client/common/common.c client/common/common.h
bemenu: common.a client/bemenu.c

2
lib/renderers/cairo.h → lib/renderers/cairo_renderer.h
View File

@ -5,7 +5,7 @@
#include <string.h>
#include <assert.h>
#include <math.h>
#include <cairo/cairo.h>
#include <cairo.h>
#include <pango/pangocairo.h>
struct cairo {

2
lib/renderers/wayland/wayland.h
View File

@ -6,7 +6,7 @@
#include "wlr-layer-shell-unstable-v1.h"
#include "xdg-output-unstable-v1.h"
#include "renderers/cairo.h"
#include "renderers/cairo_renderer.h"
struct bm_menu;

2
lib/renderers/x11/x11.h
View File

@ -4,7 +4,7 @@
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include "renderers/cairo.h"
#include "renderers/cairo_renderer.h"
enum mod_bit {
MOD_SHIFT = 1<<0,