From 1fa78e69c5f97201b8588ccabf19e10c1bf511e1 Mon Sep 17 00:00:00 2001 From: retro-wertz Date: Thu, 18 Jul 2019 11:57:42 +0800 Subject: [PATCH] Fix android build --- src/libretro/jni/Android.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/libretro/jni/Android.mk b/src/libretro/jni/Android.mk index 2529e506..304e8042 100644 --- a/src/libretro/jni/Android.mk +++ b/src/libretro/jni/Android.mk @@ -7,9 +7,20 @@ include $(LIBRETRO_DIR)/Makefile.common COREFLAGS := -DHAVE_STDINT_H -DLSB_FIRST -D__LIBRETRO__ -DFINAL_VERSION -DC_CORE -DNO_LINK -DFRONTEND_SUPPORTS_RGB565 -DTILED_RENDERING -DNO_DEBUGGER $(INCFLAGS) -GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" -ifneq ($(GIT_VERSION)," unknown") - COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +#GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +#ifneq ($(GIT_VERSION)," unknown") +# COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +#endif + +VBAM_VERSION := $(shell sed -En 's/.*\[([0-9]+[^]]+).*/\1/p; T; q' ../../CHANGELOG.md 2>/dev/null) + +COREFLAGS += -DVBAM_VERSION=\"$(VBAM_VERSION)\" + +TAG_COMMIT := $(shell git rev-list -n 1 v$(VBAM_VERSION) --abbrev-commit 2>/dev/null) +CURRENT_COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null) + +ifneq ($(CURRENT_COMMIT),$(TAG_COMMIT)) +COREFLAGS += -DGIT_COMMIT=\"$(CURRENT_COMMIT)\" endif include $(CLEAR_VARS)