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

- 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)

# Conflicts:
#	src/version.h

# Conflicts:
#	src/win32/zdoom.rc
This commit is contained in:
Rachael Alexanderson 2019-02-13 21:34:44 -05:00 committed by drfrag
parent 842dff300e
commit 197c618dac

View file

@ -80,7 +80,7 @@ BEGIN
" VALUE ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n" " VALUE ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n"
" VALUE ""OriginalFilename"", ""lzdoom.exe""\r\n" " VALUE ""OriginalFilename"", ""lzdoom.exe""\r\n"
" VALUE ""ProductName"", ""LZDoom""\r\n" " VALUE ""ProductName"", ""LZDoom""\r\n"
" VALUE ""ProductVersion"", RC_PRODUCTVERSION2\r\n" " VALUE ""ProductVersion"", GIT_VERSION\r\n"
" END\r\n" " END\r\n"
" END\r\n" " END\r\n"
" BLOCK ""VarFileInfo""\r\n" " BLOCK ""VarFileInfo""\r\n"
@ -529,14 +529,14 @@ BEGIN
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 "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 "CompanyName", " "
VALUE "FileDescription", "LZDoom" VALUE "FileDescription", "LZDoom " GIT_DESCRIPTION
VALUE "FileVersion", RC_FILEVERSION2 VALUE "FileVersion", RC_FILEVERSION2
VALUE "InternalName", "LZDoom" VALUE "InternalName", "LZDoom"
VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al." 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 "LegalTrademarks", "Doom® is a Registered Trademark of id Software, Inc."
VALUE "OriginalFilename", "lzdoom.exe" VALUE "OriginalFilename", "lzdoom.exe"
VALUE "ProductName", "LZDoom" VALUE "ProductName", "LZDoom"
VALUE "ProductVersion", RC_PRODUCTVERSION2 VALUE "ProductVersion", GIT_DESCRIPTION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"