diff options
| author | Christian Soffke <christian.soffke@gmail.com> | 2021-02-21 04:55:32 +0100 |
|---|---|---|
| committer | Christian Soffke <christian.soffke@gmail.com> | 2021-02-21 05:23:39 +0100 |
| commit | 05f10062461adb658a885c1b034e5c4519c19bc4 (patch) | |
| tree | a90fed01271263e505e4440510cd724c26b5b4ec | |
| parent | bdc3dd4fca4aa628b934e7a0bc5d9d5955cdc2cd (diff) | |
| download | rockbox-05f10062461adb658a885c1b034e5c4519c19bc4.tar.gz rockbox-05f10062461adb658a885c1b034e5c4519c19bc4.zip | |
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
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | 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 | |||
| 94 | convttf: convttf.c | 94 | convttf: convttf.c |
| 95 | $(call PRINTS,CC $(@F)) | 95 | $(call PRINTS,CC $(@F)) |
| 96 | $(SILENT)$(CC) $(CFLAGS) -lm -std=c99 -O2 -Wall -g $+ -o $@ \ | 96 | $(SILENT)$(CC) $(CFLAGS) -lm -std=c99 -O2 -Wall -g $+ -o $@ \ |
| 97 | `freetype-config --libs` `freetype-config --cflags` | 97 | `pkg-config --cflags --libs freetype2` |
| 98 | 98 | ||
| 99 | clean: | 99 | clean: |
| 100 | @echo "Cleaning tools" | 100 | @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/*. | |||
| 38 | $(TOOLSDIR)/convttf: $(TOOLSDIR)/convttf.c | 38 | $(TOOLSDIR)/convttf: $(TOOLSDIR)/convttf.c |
| 39 | $(call PRINTS,CC $(@F)) | 39 | $(call PRINTS,CC $(@F)) |
| 40 | $(SILENT)$(HOSTCC) $(TOOLSFLAGS) -lm -O2 -Wall -g $+ -o $@ \ | 40 | $(SILENT)$(HOSTCC) $(TOOLSFLAGS) -lm -O2 -Wall -g $+ -o $@ \ |
| 41 | `freetype-config --libs` `freetype-config --cflags` | 41 | `pkg-config --cflags --libs freetype2` |
| 42 | 42 | ||
| 43 | # implicit rule for simple tools | 43 | # implicit rule for simple tools |
| 44 | $(TOOLSDIR)/%: $(TOOLSDIR)/%.c | 44 | $(TOOLSDIR)/%: $(TOOLSDIR)/%.c |