From a7f9418572f6996158fb85690eb6460702d4a13e Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 4 Dec 2016 19:34:02 -0500 Subject: [PATCH] add git version --- Makefile | 3 ++- jni/Android.mk | 3 ++- libretro.cpp | 4 ++++ libretro_options.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b4eb5abc..5f373e0b 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +GIT_VERSION := " $(shell git rev-parse --short HEAD)" DEBUG = 0 FRONTEND_SUPPORTS_RGB565 = 1 HAVE_RUST = 0 @@ -379,7 +380,7 @@ LDFLAGS += $(fpic) $(SHARED) FLAGS += $(fpic) $(NEW_GCC_FLAGS) FLAGS += $(INCFLAGS) -FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.38.6\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=9386 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -D_LOW_ACCURACY_ $(EXTRA_INCLUDES) $(SOUND_DEFINE) -D__STDC_CONSTANT_MACROS +FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.38.6\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=9386 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -D_LOW_ACCURACY_ $(EXTRA_INCLUDES) $(SOUND_DEFINE) -D__STDC_CONSTANT_MACROS -DGIT_VERSION=\"$(GIT_VERSION)\" ifeq ($(HAVE_RUST),1) FLAGS += -DHAVE_RUST diff --git a/jni/Android.mk b/jni/Android.mk index 01a1128a..1b7cb31e 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,3 +1,4 @@ +GIT_VERSION := " $(shell git rev-parse --short HEAD)" LOCAL_PATH := $(call my-dir) DEBUG = 0 FRONTEND_SUPPORTS_RGB565 = 1 @@ -50,7 +51,7 @@ endif LDFLAGS += $(fpic) $(SHARED) FLAGS += $(fpic) $(NEW_GCC_FLAGS) $(INCFLAGS) -FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.26\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=926 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -DNDEBUG -D_LOW_ACCURACY_ $(SOUND_DEFINE) -D__STDC_CONSTANT_MACROS +FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.26\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=926 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -DNDEBUG -D_LOW_ACCURACY_ $(SOUND_DEFINE) -D__STDC_CONSTANT_MACROS -DGIT_VERSION=\"$(GIT_VERSION)\" $(INCFLAGS) LOCAL_CFLAGS = $(FLAGS) LOCAL_CXXFLAGS = $(FLAGS) -fexceptions diff --git a/libretro.cpp b/libretro.cpp index 4a1682d9..f6066f8c 100644 --- a/libretro.cpp +++ b/libretro.cpp @@ -3900,7 +3900,11 @@ void retro_get_system_info(struct retro_system_info *info) { memset(info, 0, sizeof(*info)); info->library_name = MEDNAFEN_CORE_NAME; +#ifdef GIT_VERSION + info->library_version = MEDNAFEN_CORE_VERSION GIT_VERSION; +#else info->library_version = MEDNAFEN_CORE_VERSION; +#endif info->need_fullpath = true; info->valid_extensions = MEDNAFEN_CORE_EXTENSIONS; info->block_extract = false; diff --git a/libretro_options.h b/libretro_options.h index 666eb1ba..d91862e3 100644 --- a/libretro_options.h +++ b/libretro_options.h @@ -4,7 +4,7 @@ #else #define MEDNAFEN_CORE_NAME "Mednafen PSX" #endif -#define MEDNAFEN_CORE_VERSION "v0.9.39.2" +#define MEDNAFEN_CORE_VERSION "0.9.39.2" #define MEDNAFEN_CORE_EXTENSIONS "exe|cue|toc|ccd|m3u|pbp" #define MEDNAFEN_CORE_GEOMETRY_BASE_W 320 #define MEDNAFEN_CORE_GEOMETRY_BASE_H 240