From 55d4bd88164f02e33d2c3d75a036437c50afe40e Mon Sep 17 00:00:00 2001 From: Manuel Reimer Date: Thu, 10 May 2018 18:58:16 +0200 Subject: Fix building against freetype2 2.9.1 --- glcdgraphics/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'glcdgraphics') diff --git a/glcdgraphics/Makefile b/glcdgraphics/Makefile index cba3a37..98cbbbc 100644 --- a/glcdgraphics/Makefile +++ b/glcdgraphics/Makefile @@ -41,14 +41,9 @@ DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) ifdef HAVE_FREETYPE2 - ifneq ($(shell which freetype-config),) - INCLUDES += $(shell freetype-config --cflags) - LIBS += $(shell freetype-config --libs) - else - INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype - LIBS += -lfreetype - endif DEFINES += -DHAVE_FREETYPE2 + INCLUDES += $(shell pkg-config freetype2 --cflags) + LIBS += $(shell pkg-config freetype2 --libs) endif # two ifdef/endif are used because older installations may not support 'else ifdef' -- cgit v1.2.3