From 4076cfa17819a5ec70d8a50769c6ec35f1435064 Mon Sep 17 00:00:00 2001 From: Apaczer <94932128+Apaczer@users.noreply.github.com> Date: Mon, 27 Nov 2023 08:53:16 +0100 Subject: [PATCH] [PACKAGE] GMENU2X - rm predefined FLAGS from *.mk (#59) use GMENU2X_HASH only for commits sha in about --- package/gmenu2x/gmenu2x.mk | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/package/gmenu2x/gmenu2x.mk b/package/gmenu2x/gmenu2x.mk index bf722a60..2338dba2 100644 --- a/package/gmenu2x/gmenu2x.mk +++ b/package/gmenu2x/gmenu2x.mk @@ -1,29 +1,31 @@ +################################################################################ +# +# GMenu2X +# +################################################################################ + GMENU2X_VERSION = origin/master GMENU2X_SITE_METHOD = git GMENU2X_SITE = https://github.com/MiyooCFW/gmenu2x.git GMENU2X_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_sound sdl_ttf -PLATFORM = miyoo -BUILDTIME := \"$(shell date +%F\ %H:%M)\" -BUILDROOT_HASH := $(shell git rev-parse --short HEAD) -SDL_CFLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags) -CFLAGS = -DPLATFORM=\"$(PLATFORM)\" -D__BUILDTIME__=$(BUILDTIME) -D__BUILDROOT_HASH__=$(BUILDROOT_HASH) -DLOG_LEVEL=3 +GMENU2X_BUILDTIME = \"$(shell date +%F\ %H:%M)\" +GMENU2X_BUILDROOT_HASH = $(shell git rev-parse --short HEAD) +GMENU2X_HASH = -D__BUILDTIME__=$(GMENU2X_BUILDTIME) -D__BUILDROOT_HASH__=$(GMENU2X_BUILDROOT_HASH) \ + -D__COMMIT_HASH__=$(shell git -C $(GMENU2X_DL_DIR)/git rev-parse --short HEAD) ifdef CFW_HASH -ifneq ($(CFW_HASH), $(BUILDROOT_HASH)) -CFLAGS += -D__CFW_HASH__=$(CFW_HASH) +ifneq ($(CFW_HASH), $(GMENU2X_BUILDROOT_HASH)) +GMENU2X_HASH += -D__CFW_HASH__=$(CFW_HASH) endif endif -CFLAGS += -Isrc -CFLAGS += -O0 -ggdb -g3 $(SDL_CFLAGS) -CFLAGS += -DTARGET_MIYOO -DHW_LIDVOL -DIPK_SUPPORT define GMENU2X_BUILD_CMDS - $(MAKE) CFLAGS="$(CFLAGS) -D__COMMIT_HASH__=$(shell git -C $(GMENU2X_DL_DIR)/git rev-parse --short HEAD)" CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" STRIP="$(TARGET_STRIP)" LD="$(TARGET_LD)" -C $(@D) -f Makefile.miyoo dist + $(MAKE) GMENU2X_HASH="$(GMENU2X_HASH)" CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" STRIP="$(TARGET_STRIP)" LD="$(TARGET_LD)" -C $(@D) -f Makefile.miyoo dist endef define GMENU2X_INSTALL_TARGET_CMDS - mkdir -p "${BINARIES_DIR}/gmenu2x/" - cp -r $(@D)/dist/miyoo/* "${BINARIES_DIR}/gmenu2x/" + mkdir -p $(BINARIES_DIR)/gmenu2x/ + cp -r $(@D)/dist/miyoo/* $(BINARIES_DIR)/gmenu2x/ endef $(eval $(generic-package))