notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fa5898e
)
always describe to get git hash in log messages
author
notaz
<notasas@gmail.com>
Sun, 23 Jan 2022 20:57:06 +0000
(22:57 +0200)
committer
notaz
<notasas@gmail.com>
Sun, 23 Jan 2022 20:59:02 +0000
(22:59 +0200)
Makefile
patch
|
blob
|
blame
|
history
jni/Android.mk
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index
3f33bd3
..
f21b823
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-366,7
+366,7
@@
libpcsxcore/gte_nf.o: libpcsxcore/gte.c
$(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
frontend/revision.h: FORCE
$(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
frontend/revision.h: FORCE
- @(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_
+ @(git describe
--always
|| echo) | sed -e 's/.*/#define REV "\0"/' > $@_
@diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@
@rm $@_
@diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@
@rm $@_
@@
-410,7
+410,7
@@
endif
# ----------- release -----------
# ----------- release -----------
-VER ?= $(shell git describe HEAD)
+VER ?= $(shell git describe
--always
HEAD)
ifeq "$(PLATFORM)" "generic"
OUT = pcsx_rearmed_$(VER)
ifeq "$(PLATFORM)" "generic"
OUT = pcsx_rearmed_$(VER)
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
50aa696
..
d8fdd42
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-1,6
+1,6
@@
LOCAL_PATH := $(call my-dir)
LOCAL_PATH := $(call my-dir)
-$(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_))
+$(shell cd "$(LOCAL_PATH)" && ((git describe
--always
|| echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_))
$(shell cd "$(LOCAL_PATH)" && (diff -q ../frontend/revision.h_ ../frontend/revision.h > /dev/null 2>&1 || cp ../frontend/revision.h_ ../frontend/revision.h))
$(shell cd "$(LOCAL_PATH)" && (rm ../frontend/revision.h_))
$(shell cd "$(LOCAL_PATH)" && (diff -q ../frontend/revision.h_ ../frontend/revision.h > /dev/null 2>&1 || cp ../frontend/revision.h_ ../frontend/revision.h))
$(shell cd "$(LOCAL_PATH)" && (rm ../frontend/revision.h_))