diff options
| author | Manuel Reimer <manuel.reimer@gmx.de> | 2018-05-10 18:58:16 +0200 |
|---|---|---|
| committer | Manuel Reimer <manuel.reimer@gmx.de> | 2018-05-10 18:58:16 +0200 |
| commit | 55d4bd88164f02e33d2c3d75a036437c50afe40e (patch) | |
| tree | 502ab0d2136b387479d344bd5fded33b5f141110 | |
| parent | e9ab0b821e9c0db017d1cedcd0b7043c1d4b7299 (diff) | |
| download | graphlcd-base-55d4bd88164f02e33d2c3d75a036437c50afe40e.tar.gz graphlcd-base-55d4bd88164f02e33d2c3d75a036437c50afe40e.tar.bz2 | |
Fix building against freetype2 2.9.11.0.1
| -rw-r--r-- | glcdgraphics/Makefile | 9 | ||||
| -rw-r--r-- | tools/genfont/Makefile | 4 |
2 files changed, 4 insertions, 9 deletions
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' diff --git a/tools/genfont/Makefile b/tools/genfont/Makefile index c4aab2f..1a68ad0 100644 --- a/tools/genfont/Makefile +++ b/tools/genfont/Makefile @@ -9,10 +9,10 @@ PRGNAME = genfont OBJS = genfont.o INCLUDES += -I../../ -INCLUDES += `freetype-config --cflags` +INCLUDES += $(shell pkg-config freetype2 --cflags) LIBDIRS += -L../../glcdgraphics/ -LIBS += `freetype-config --libs` +LIBS += $(shell pkg-config freetype2 --libs) all: $(PRGNAME) .PHONY: all |