Merge pull request #85 from orbea/git

libretro: Allow setting GIT_VERSION.

diff --git a/Makefile.libretro b/Makefile.libretro
index 05e8bd8..1e07d50 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -26,7 +26,7 @@ CFLAGS ?=
 STATIC_LINKING:= 0
 TARGET_NAME := picodrive
 LIBM := -lm
-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
 ifneq ($(GIT_VERSION)," unknown")
        CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif

diff --git a/jni/Android.mk b/jni/Android.mk
index bc81702..9252d9f 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
 ifneq ($(GIT_VERSION)," unknown")
        LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif