From 05f10062461adb658a885c1b034e5c4519c19bc4 Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Sun, 21 Feb 2021 04:55:32 +0100 Subject: [PATCH] Convttf makefile: Replace freetype-config with pkg-config Freetype-config has been deprecated and is no longer included in libfreetype-dev. Pkg-config serves as its replacement. Convttf isn't built as part of Rockbox by default, but manually doing so will currently fail even when libfreetype-dev is installed. Change-Id: Iafc31df3b40c11d7c790189eb9d3788ba97d3e54 --- tools/Makefile | 2 +- tools/tools.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index d63be9e919..92af254fcd 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -94,7 +94,7 @@ usb_benchmark: usb_benchmark.c convttf: convttf.c $(call PRINTS,CC $(@F)) $(SILENT)$(CC) $(CFLAGS) -lm -std=c99 -O2 -Wall -g $+ -o $@ \ - `freetype-config --libs` `freetype-config --cflags` + `pkg-config --cflags --libs freetype2` clean: @echo "Cleaning tools" diff --git a/tools/tools.make b/tools/tools.make index 3350ad03bc..483d306950 100644 --- a/tools/tools.make +++ b/tools/tools.make @@ -38,7 +38,7 @@ $(TOOLSDIR)/uclpack: $(TOOLSDIR)/ucl/uclpack.c $(wildcard $(TOOLSDIR)/ucl/src/*. $(TOOLSDIR)/convttf: $(TOOLSDIR)/convttf.c $(call PRINTS,CC $(@F)) $(SILENT)$(HOSTCC) $(TOOLSFLAGS) -lm -O2 -Wall -g $+ -o $@ \ - `freetype-config --libs` `freetype-config --cflags` + `pkg-config --cflags --libs freetype2` # implicit rule for simple tools $(TOOLSDIR)/%: $(TOOLSDIR)/%.c