Skip to content
Permalink
Browse files

Fix android build

  • Loading branch information
retro-wertz
retro-wertz committed Jul 18, 2019
1 parent 6dcf016 commit 1fa78e69c5f97201b8588ccabf19e10c1bf511e1
Showing with 14 additions and 3 deletions.
  1. +14 −3 src/libretro/jni/Android.mk
@@ -7,9 +7,20 @@ include $(LIBRETRO_DIR)/Makefile.common

COREFLAGS := -DHAVE_STDINT_H -DLSB_FIRST -D__LIBRETRO__ -DFINAL_VERSION -DC_CORE -DNO_LINK -DFRONTEND_SUPPORTS_RGB565 -DTILED_RENDERING -DNO_DEBUGGER $(INCFLAGS)

GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
#GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
#ifneq ($(GIT_VERSION)," unknown")
# COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
#endif

VBAM_VERSION := $(shell sed -En 's/.*\[([0-9]+[^]]+).*/\1/p; T; q' ../../CHANGELOG.md 2>/dev/null)

COREFLAGS += -DVBAM_VERSION=\"$(VBAM_VERSION)\"

TAG_COMMIT := $(shell git rev-list -n 1 v$(VBAM_VERSION) --abbrev-commit 2>/dev/null)
CURRENT_COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)

ifneq ($(CURRENT_COMMIT),$(TAG_COMMIT))
COREFLAGS += -DGIT_COMMIT=\"$(CURRENT_COMMIT)\"
endif

include $(CLEAR_VARS)

0 comments on commit 1fa78e6

Please sign in to comment.
You can’t perform that action at this time.