From 187b8fbbae905ac5612f41002a2d17e2463ecd95 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Wed, 7 Feb 2024 19:42:17 -0500 Subject: [PATCH] Change Makefile from ttf examples --- CHANGELOG.md | 2 +- examples/gamecube/ttf/Makefile | 5 ++--- examples/ttf/Makefile | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b713fa0..3369548 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. ## [Unreleased][] - Fixed compatibility issues with devkitPPC release 39. -- Fixed linking problem in examples with FreeType 2.13.2. +- Fixed linking problem in examples with FreeType 2.13.2 (pkgrel 1 and 2). - Added `GRRLIB_LoadTTFFromFile()` to load a TTF from a file. - Added `GRRLIB_Ellipse()` to draw an ellipse. - Changed `GRRLIB_PrintfTTF()` and `GRRLIB_PrintfTTFW()` so they use the alpha channel from the `color` parameter. diff --git a/examples/gamecube/ttf/Makefile b/examples/gamecube/ttf/Makefile index fb5d395..32a0e4e 100644 --- a/examples/gamecube/ttf/Makefile +++ b/examples/gamecube/ttf/Makefile @@ -34,9 +34,8 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map # any extra libraries we wish to link with the project # the order can-be/is critical #--------------------------------------------------------------------------------- -LIBS := -lgrrlib -LIBS += `freetype-config --libs` -LIBS += -lpngu -lpng -ljpeg -lz -lfat +LIBS := -lgrrlib -lpngu +LIBS += `$(PREFIX)pkg-config freetype2 libpng libjpeg --libs` -lfat #LIBS += -lmodplay -laesnd LIBS += -logc -lm diff --git a/examples/ttf/Makefile b/examples/ttf/Makefile index e7c812d..d866d51 100644 --- a/examples/ttf/Makefile +++ b/examples/ttf/Makefile @@ -34,9 +34,8 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map # any extra libraries we wish to link with the project # the order can-be/is critical #--------------------------------------------------------------------------------- -LIBS := -lgrrlib -LIBS += `freetype-config --libs` -LIBS += -lpngu -lpng -ljpeg -lz -lfat +LIBS := -lgrrlib -lpngu +LIBS += `$(PREFIX)pkg-config freetype2 libpng libjpeg --libs` -lfat LIBS += -lwiiuse #LIBS += -lmodplay -laesnd LIBS += -lbte -logc -lm