From 2d52bde825a3fe0c72c4b18f7dc75157ef678631 Mon Sep 17 00:00:00 2001 From: orbea Date: Tue, 3 Apr 2018 10:41:26 -0700 Subject: [PATCH] libretro: Allow setting GIT_VERSION. --- Makefile.libretro | 2 +- jni/Android.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index daeb0285..89cfea1c 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -41,7 +41,7 @@ CFLAGS += -I platform/libretro/libretro-common/include/vfs STATIC_LINKING:= 0 TARGET_NAME := picodrive LIBM := -lm -GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)" ifneq ($(GIT_VERSION)," unknown") CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" endif diff --git a/jni/Android.mk b/jni/Android.mk index b72cbba9..1ff6c9e7 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -52,8 +52,8 @@ SOURCES_C := $(LIBRETRO_DIR)/libretro.c \ COREFLAGS := $(addprefix -D,$(DEFINES)) -fno-strict-aliasing -GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" -ifneq ($(GIT_VERSION)," unknown") +GIT_VERSION := $(shell git rev-parse --short HEAD || echo unknown) +ifneq ($(GIT_VERSION),"unknown") COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" endif