From: kub <derkub@gmail.com>
Date: Sat, 3 Jun 2023 21:09:05 +0000 (+0000)
Subject: libretro, fix build conflict
X-Git-Tag: v2.00~217
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab43a4b2fdca360ef9a8d4c79cd9d7980028302f;p=picodrive.git

libretro, fix build conflict
---

diff --git a/Makefile b/Makefile
index 6abb430d..b2a035f0 100644
--- 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 caa22721..a57a24c7 100644
--- 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 :=