From 32c3c49bf03ac9a49f42be2ec64f1c72edb5a215 Mon Sep 17 00:00:00 2001 From: Apaczer <94932128+Apaczer@users.noreply.github.com> Date: Fri, 9 Aug 2024 22:29:20 +0200 Subject: [PATCH] Makefiles: simplify rules with pkg-config call --- Makefile | 5 ++--- Makefile.miyoo | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e72d8f7..aae181a 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,7 @@ STRIP := $(CROSS_COMPILE)strip SYSROOT := $(shell $(CC) --print-sysroot) SDL_CFLAGS := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags) -SDL_LIBS := $(shell $(SYSROOT)/usr/bin/sdl-config --libs) -FREETYPE_LIBS := $(shell $(SYSROOT)/usr/bin/freetype-config --libs) +PKG_LIBS := $(shell $(CHAINPREFIX)/usr/bin/pkg-config --libs sdl SDL_image SDL_ttf) CFLAGS = -DPLATFORM=\"$(PLATFORM)\" $(GMENU2X_HASH) -DLOG_LEVEL=4 CFLAGS += -O0 -ggdb -g -pg $(SDL_CFLAGS) @@ -20,7 +19,7 @@ CFLAGS += -Isrc -Isrc/libopk CFLAGS += -DTARGET_LINUX -DHW_TVOUT -DHW_UDC -DHW_EXT_SD -DHW_SCALER -DOPK_SUPPORT -DIPK_SUPPORT LDFLAGS = -Wl,-Bstatic -Lsrc/libopk -l:libopk.a -LDFLAGS += -Wl,-Bdynamic -lz $(SDL_LIBS) -lSDL_image -lSDL_ttf -ltiff $(FREETYPE_LIBS) -ljpeg -lwebp +LDFLAGS += -Wl,-Bdynamic -lz $(PKG_LIBS) OBJDIR = /tmp/gmenu2x/$(PLATFORM) DISTDIR = dist/$(PLATFORM) diff --git a/Makefile.miyoo b/Makefile.miyoo index d4d9f2c..33f6440 100644 --- a/Makefile.miyoo +++ b/Makefile.miyoo @@ -15,8 +15,7 @@ STRIP := $(CROSS_COMPILE)strip SYSROOT := $(shell $(CC) --print-sysroot) SDL_CFLAGS := $(shell $(SYSROOT)/usr/bin/sdl-config --cflags) -SDL_LIBS := $(shell $(SYSROOT)/usr/bin/sdl-config --libs) -FREETYPE_LIBS := $(shell $(SYSROOT)/usr/bin/freetype-config --libs) +PKG_LIBS := $(shell $(SYSROOT)/../../pkg-config --libs sdl SDL_image SDL_ttf) CFLAGS = -DPLATFORM=\"$(PLATFORM)\" -DLOG_LEVEL=3 $(GMENU2X_HASH) CFLAGS += -Isrc @@ -24,7 +23,7 @@ CFLAGS += -Isrc CFLAGS += -O0 -ggdb -g3 $(SDL_CFLAGS) CFLAGS += -DTARGET_MIYOO -DHW_LIDVOL -DIPK_SUPPORT -LDFLAGS = $(SDL_LIBS) -lSDL_image -lSDL_ttf -ltiff $(FREETYPE_LIBS) -ljpeg -lwebp +LDFLAGS = $(PKG_LIBS) OBJDIR = /tmp/gmenu2x/$(PLATFORM) DISTDIR = dist/$(PLATFORM)