diff --git a/Makefile b/Makefile index 35ef6e3..f6a087c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ LDFLAGS = -Wl,--enable-stdcall-fixup -s -static -shared CFLAGS = -Iinc -O2 -march=i486 -Wall LIBS = -lgdi32 -lwinmm -ldbghelp -lole32 -REV := $(shell git rev-parse --short HEAD || echo "UNKNOWN") +REV := $(shell git describe --match=NeVeRmAtCh --always --abbrev=7 --dirty || echo "UNKNOWN") BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo "UNKNOWN") EREV := $(shell echo "#define GIT_COMMIT" $(REV) > inc/version_tmp.h) EBRANCH := $(shell echo "#define GIT_BRANCH" $(BRANCH) >> inc/version_tmp.h) diff --git a/cnc-ddraw.vcxproj b/cnc-ddraw.vcxproj index 0658bb2..21126c2 100644 --- a/cnc-ddraw.vcxproj +++ b/cnc-ddraw.vcxproj @@ -239,7 +239,7 @@ if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\Te if not exist %GIT_PATH% SET GIT_PATH="git.exe" echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE% -%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% +%GIT_PATH% describe --match=NeVeRmAtCh --always --abbrev=7 --dirty >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE% %GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% @@ -283,7 +283,7 @@ if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\Te if not exist %GIT_PATH% SET GIT_PATH="git.exe" echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE% -%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% +%GIT_PATH% describe --match=NeVeRmAtCh --always --abbrev=7 --dirty >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE% %GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% @@ -327,7 +327,7 @@ if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\Te if not exist %GIT_PATH% SET GIT_PATH="git.exe" echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE% -%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% +%GIT_PATH% describe --match=NeVeRmAtCh --always --abbrev=7 --dirty >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE% %GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% @@ -371,7 +371,7 @@ if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\Te if not exist %GIT_PATH% SET GIT_PATH="git.exe" echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE% -%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% +%GIT_PATH% describe --match=NeVeRmAtCh --always --abbrev=7 --dirty >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE% %GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% @@ -415,7 +415,7 @@ if not exist %GIT_PATH% SET GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\Te if not exist %GIT_PATH% SET GIT_PATH="git.exe" echo | set /p dummyName=#define GIT_COMMIT > %DST_FILE% -%GIT_PATH% rev-parse --short HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% +%GIT_PATH% describe --match=NeVeRmAtCh --always --abbrev=7 --dirty >> %DST_FILE% || echo UNKNOWN >> %DST_FILE% echo | set /p dummyName=#define GIT_BRANCH >> %DST_FILE% %GIT_PATH% rev-parse --abbrev-ref HEAD >> %DST_FILE% || echo UNKNOWN >> %DST_FILE%