diff --git a/Makefile b/Makefile index 13a9d60..25ac649 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ IBUS_CFLAGS = $(shell $(PKG_CONFIG) --cflags dbus-1 xkbcommon) IBUS_LIBS = $(shell $(PKG_CONFIG) --libs dbus-1 xkbcommon) XIM_CFLAGS = $(shell $(PKG_CONFIG) --cflags xcb-imdkit xcb-xkb xkbcommon-x11) XIM_LIBS = $(shell $(PKG_CONFIG) --libs xcb-imdkit xcb-xkb xkbcommon-x11) -TEXT_CFLAGS = $(shell $(PKG_CONFIG) --cflags pangocairo cairo) -TEXT_LIBS = $(shell $(PKG_CONFIG) --libs pangocairo cairo) +TEXT_CFLAGS = $(shell $(PKG_CONFIG) --cflags pangocairo cairo fontconfig) +TEXT_LIBS = $(shell $(PKG_CONFIG) --libs pangocairo cairo fontconfig) POPUP_CFLAGS = $(shell $(PKG_CONFIG) --cflags xcb-randr) POPUP_LIBS = $(shell $(PKG_CONFIG) --libs xcb-randr) PROJECT_CPPFLAGS = diff --git a/font.c b/font.c index 6c1d0b4..00a1b04 100644 --- a/font.c +++ b/font.c @@ -1,4 +1,5 @@ #include "dat.h" +#include #include #include "fn.h" @@ -53,6 +54,7 @@ int textinit(void) { textclose(); + FcInit(); fontmap = pango_cairo_font_map_new(); if(fontmap == nil){ fprint(2, "strans: popup: can't initialize PangoCairo\n"); diff --git a/tests/Makefile b/tests/Makefile index 19f341b..8130349 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -6,8 +6,8 @@ CFLAGS ?= -O2 -g UNIT_CPPFLAGS = -I.. -I../cutest UNIT_CFLAGS = -std=c99 -Wall -Wextra HOST_CFLAGS = -std=c99 -Wall -Wextra -TEXT_CFLAGS = $(shell $(PKG_CONFIG) --cflags pangocairo cairo) -TEXT_LIBS = $(shell $(PKG_CONFIG) --libs pangocairo cairo) +TEXT_CFLAGS = $(shell $(PKG_CONFIG) --cflags pangocairo cairo fontconfig) +TEXT_LIBS = $(shell $(PKG_CONFIG) --libs pangocairo cairo fontconfig) DBUS_CFLAGS = $(shell $(PKG_CONFIG) --cflags dbus-1) DBUS_LIBS = $(shell $(PKG_CONFIG) --libs dbus-1) GTK_CFLAGS = $(shell $(PKG_CONFIG) --cflags gtk+-3.0)