diff options
author | Twinaphex | 2016-12-10 00:42:50 +0100 |
---|---|---|
committer | GitHub | 2016-12-10 00:42:50 +0100 |
commit | e87b0278d9785a4cfa6d63009ce717f5b78000fb (patch) | |
tree | 75960394a4425afd1730304175197b8bd22897c7 | |
parent | 4d860aeb3d0c2d2c8c4f0dee9d295f80dbc2033e (diff) | |
parent | 415b5ba67bd7f07dcb87d4841da69b0c3254e5c0 (diff) | |
download | picogpsp-e87b0278d9785a4cfa6d63009ce717f5b78000fb.tar.gz picogpsp-e87b0278d9785a4cfa6d63009ce717f5b78000fb.tar.bz2 picogpsp-e87b0278d9785a4cfa6d63009ce717f5b78000fb.zip |
Merge pull request #34 from GregorR/libretro-git-version
Report git version with library_version
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | jni/Android.mk | 5 | ||||
-rw-r--r-- | libretro.c | 5 |
3 files changed, 13 insertions, 1 deletions
@@ -62,6 +62,10 @@ else ifneq ($(findstring Darwin,$(UNAME)),) endif TARGET_NAME := gpsp +GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +ifneq ($(GIT_VERSION)," unknown") + CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +endif LIBM := -lm CORE_DIR := . LDFLAGS := diff --git a/jni/Android.mk b/jni/Android.mk index 442daa9..05a96c9 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -2,6 +2,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +ifneq ($(GIT_VERSION)," unknown") + LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +endif + LOCAL_MODULE := retro CPU_ARCH := @@ -116,7 +116,10 @@ extern struct retro_perf_callback perf_cb; void retro_get_system_info(struct retro_system_info* info) { info->library_name = "gpSP"; - info->library_version = "v0.91"; +#ifndef GIT_VERSION +#define GIT_VERSION "" +#endif + info->library_version = "v0.91" GIT_VERSION; info->need_fullpath = true; info->block_extract = false; info->valid_extensions = "gba|bin|agb|gbz" ; |