Unverified Commit 10fcd60c authored by Libretro-Admin's avatar Libretro-Admin Committed by GitHub
Browse files

Merge pull request #17 from webgeek1234/master

Android updates
parents 9fe37280 35095709
LOCAL_PATH := $(call my-dir)
CORE_DIR := $(LOCAL_PATH)/../..
INCLUDES :=
SOURCES_C :=
SOURCES_CXX :=
include $(CORE_DIR)/build/Makefile.common
SOURCES_C := $(filter-out %/version.c, $(SOURCES_C))
COREFLAGS := -D__LIBRETRO__ $(RETRODEFS) $(INCLUDES)
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif
include $(CLEAR_VARS)
LOCAL_MODULE := retro
LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_CXX)
LOCAL_CPPFLAGS := -std=c++11 $(COREFLAGS)
LOCAL_CFLAGS := $(COREFLAGS)
LOCAL_LDFLAGS := -Wl,-version-script=$(CORE_DIR)/build/link.T
include $(BUILD_SHARED_LIBRARY)
APP_ABI := all
APP_STL := c++_static
......@@ -276,11 +276,17 @@ static int update_variables()
}
#define VERSION "1.0a"
#ifdef GIT_VERSION
static char version[] = VERSION " " GIT_VERSION;
#else
static char version[] = VERSION " .......";
#endif
void retro_get_system_info( struct retro_system_info* info )
{
#ifndef GIT_VERSION
memcpy(version + sizeof(VERSION), eo_githash, 7);
#endif
info->library_name = "EightyOne";
info->library_version = version;
......@@ -353,7 +359,9 @@ bool retro_load_game( const struct retro_game_info* info )
return false;
}
#ifndef GIT_VERSION
log_cb( RETRO_LOG_INFO, "\n%s", eo_gitstamp );
#endif
memset( (void*)&state, 0, sizeof( state ) );
state.size = info->size;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment