From 58676d6ae57db26e0e3e173c58dcc858bb873d7a Mon Sep 17 00:00:00 2001 From: Manuel Moos Date: Thu, 4 Jun 2020 18:55:28 +0200 Subject: [PATCH] Bring windows tTrueVersion.h in line with Linux --- src/win32/armagetron.rc | 4 ++-- win32/update_version.bat | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/win32/armagetron.rc b/src/win32/armagetron.rc index 1527c6f58..95e15bb6c 100644 --- a/src/win32/armagetron.rc +++ b/src/win32/armagetron.rc @@ -67,8 +67,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN // VS_VERSION_INFO VERSIONINFO - FILEVERSION MAJOR_VERSION - PRODUCTVERSION MAJOR_VERSION + FILEVERSION TRUE_ARMAGETRONAD_MAJOR_VERSION + PRODUCTVERSION TRUE_ARMAGETRONAD_MAJOR_VERSION FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS VS_FF_PRERELEASE | VS_FF_DEBUG//0x1L diff --git a/win32/update_version.bat b/win32/update_version.bat index 8e76a947a..13351be29 100644 --- a/win32/update_version.bat +++ b/win32/update_version.bat @@ -92,11 +92,9 @@ echo *%DATESTAMP%* echo *%DATESTAMP:~4%* echo *%HELP_FILE%* echo *** generating tTrueVersion.h... -echo #define MAJOR_VERSION 1,%MAJOR_VERSION:.=%,0,%REV% > %HELP_FILE% +echo #define TRUE_ARMAGETRONAD_MAJOR_VERSION 1,%MAJOR_VERSION:.=%,0,%REV% > %HELP_FILE% -echo #define MINOR_VERSION %MINOR_VERSION% >> %HELP_FILE% - -echo #define BUILD_DATE "%DATESTAMP%" >> %HELP_FILE% +echo #define TRUE_ARMAGETRONAD_MINOR_VERSION %MINOR_VERSION% >> %HELP_FILE% echo #define TRUE_ARMAGETRONAD_VERSION "%MAJOR_VERSION%%MINOR_VERSION%" >> %HELP_FILE%