From 9b41cfb0993fa23c97339ec9b4123f699bd0a9cc Mon Sep 17 00:00:00 2001 From: Gregor Richards Date: Fri, 9 Dec 2016 17:38:47 -0500 Subject: [PATCH] Use git version as library_version --- Makefile.libretro | 4 ++++ jni/Android.mk | 4 ++++ src/drivers/libretro/libretro.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/Makefile.libretro b/Makefile.libretro index 4bac4c6..6fdb076 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -37,6 +37,10 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),) endif TARGET_NAME := fceumm +GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +ifneq ($(GIT_VERSION)," unknown") + CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +endif LIBM := -lm # Unix diff --git a/jni/Android.mk b/jni/Android.mk index 98194c9..cc9367a 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,4 +1,8 @@ LOCAL_PATH := $(call my-dir) +GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +ifneq ($(GIT_VERSION)," unknown") + LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +endif include $(CLEAR_VARS) diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c index 3c0fae9..d281603 100644 --- a/src/drivers/libretro/libretro.c +++ b/src/drivers/libretro/libretro.c @@ -655,7 +655,11 @@ void retro_get_system_info(struct retro_system_info *info) { info->need_fullpath = true; info->valid_extensions = "fds|nes|unf|unif"; +#ifdef GIT_VERSION + info->library_version = "git" GIT_VERSION; +#else info->library_version = "(SVN)"; +#endif info->library_name = "FCEUmm"; info->block_extract = false; }