zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 13:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove "gitversion.h" from "version.h" - should result in faster compiles after a commit in Windows

Browse source 
- Fix zdoom.rc to show the actual git commit tag and id for the Product Version
- Made zdoom.rc "codepage 1252" compliant as dictated by the #pragma (if this needs changed the pragma should be updated, this was messing up the version strings in the final compile)
This commit is contained in:
Rachael Alexanderson 2019-02-13 21:34:44 -05:00
parent be6ce43045
commit 0d2a24876b
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/version.h
View file

@ -34,10 +34,6 @@
#ifndef __VERSION_H__
#define __VERSION_H__
#ifdef _WIN32
#include "gitinfo.h"
#endif // _WIN32
const char *GetGitDescription();
const char *GetGitHash();
const char *GetGitTime();
@ -45,11 +41,7 @@ const char *GetVersionString();
/** Lots of different version numbers **/
#ifdef GIT_DESCRIPTION
#define VERSIONSTR GIT_DESCRIPTION
#else
#define VERSIONSTR "3.8pre"
#endif
// The version as seen in the Windows resource
#define RC_FILEVERSION 3,7,9999,0

12
src/win32/zdoom.rc
View file

@ -75,11 +75,11 @@ BEGIN
" VALUE ""FileDescription"", ""GZDoom""\r\n"
" VALUE ""FileVersion"", RC_FILEVERSION2\r\n"
" VALUE ""InternalName"", ""GZDoom""\r\n"
" VALUE ""LegalCopyright"", ""Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
" VALUE ""LegalCopyright"", ""Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
" VALUE ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n"
" VALUE ""OriginalFilename"", ""gzdoom.exe""\r\n"
" VALUE ""ProductName"", ""GZDoom""\r\n"
" VALUE ""ProductVersion"", RC_PRODUCTVERSION2\r\n"
" VALUE ""ProductVersion"", GIT_VERSION\r\n"
" END\r\n"
" END\r\n"
" BLOCK ""VarFileInfo""\r\n"
@ -523,14 +523,14 @@ BEGIN
BEGIN
VALUE "Comments", "Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg."
VALUE "CompanyName", " "
VALUE "FileDescription", "GZDoom"
VALUE "FileDescription", "GZDoom " GIT_DESCRIPTION
VALUE "FileVersion", RC_FILEVERSION2
VALUE "InternalName", "GZDoom"
VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al."
VALUE "LegalTrademarks", "DoomR is a Registered Trademark of id Software, Inc."
VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al."
VALUE "LegalTrademarks", "Doom® is a Registered Trademark of id Software, Inc."
VALUE "OriginalFilename", "gzdoom.exe"
VALUE "ProductName", "GZDoom"
VALUE "ProductVersion", RC_PRODUCTVERSION2
VALUE "ProductVersion", GIT_DESCRIPTION
END
END
BLOCK "VarFileInfo"