libretro, fix build conflict

diff --git a/Makefile b/Makefile
index 6abb430..b2a035f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,9 +74,9 @@ endif
 
 # revision info from repository if this not a tagged release
 ifeq "$(shell git describe --tags --exact-match HEAD 2>/dev/null)" ""
-REVISION ?= -$(shell git rev-parse --short HEAD || echo ???)
+GIT_REVISION ?= -$(shell git rev-parse --short HEAD || echo ???)
 endif
-CFLAGS += -DREVISION=\"$(REVISION)\"
+CFLAGS += -DREVISION=\"$(GIT_REVISION)\"
 
 # default settings
 use_libchdr ?= 1

diff --git a/Makefile.libretro b/Makefile.libretro
index caa2272..a57a24c 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -40,7 +40,7 @@ STATIC_LINKING_LINK:= 0
 LOW_MEMORY := 0
 TARGET_NAME := picodrive
 LIBM := -lm
-REVISION ?= -$(shell git rev-parse --short HEAD || echo ???)
+GIT_REVISION ?= -$(shell git rev-parse --short HEAD || echo ???)
 
 
 fpic :=