Added separate resource files for 64-bit builds due to VS2008 not supporting non-implicit macros in resource scripts.

This commit is contained in:
Knightmare66 2020-08-11 21:57:00 -04:00
parent 67e211d524
commit 23f5ef3494
7 changed files with 435 additions and 106 deletions

View file

@ -49,14 +49,14 @@ BEGIN
BEGIN
VALUE "Comments", "Visit our home at http://www.planetquake.com/lazarus\0"
VALUE "CompanyName", "Hyde/Ferrara\0"
VALUE "FileDescription", "Lazarus Quake II mod with CTF support\0"
VALUE "FileDescription", "Lazarus Quake II mod with CTF and ACE Bot\0"
VALUE "FileVersion", "2.230\0"
VALUE "InternalName", "kmq2gamex86.dll\0"
VALUE "LegalCopyright", "Mr. Hyde and Mad Dog\0"
VALUE "LegalTrademarks", "Lazarus is a registered trademark... oops... no it ain't, but don't use it anyway or we'll come get ya.\0"
VALUE "OriginalFilename", "kmq2gamex86.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Lazarus Quake II mod with Threewave/3Team CTF and ACE bot support\0"
VALUE "ProductName", "Lazarus Quake II mod with Threewave/3Team CTF and ACE Bot support\0"
VALUE "ProductVersion", "2.230\0"
VALUE "SpecialBuild", "KMQuake2 v0.20 update 8 compatible version created by Knightmare\0"
END

View file

@ -49,14 +49,14 @@ BEGIN
BEGIN
VALUE "Comments", "Visit our home at http://www.planetquake.com/lazarus\0"
VALUE "CompanyName", "Hyde/Ferrara\0"
VALUE "FileDescription", "Lazarus Quake II mod with CTF support\0"
VALUE "FileDescription", "Lazarus Quake II mod with CTF and ACE Bot\0"
VALUE "FileVersion", "2.230\0"
VALUE "InternalName", "kmq2gamex86.dll\0"
VALUE "LegalCopyright", "Mr. Hyde and Mad Dog\0"
VALUE "LegalTrademarks", "Lazarus is a registered trademark... oops... no it ain't, but don't use it anyway or we'll come get ya.\0"
VALUE "OriginalFilename", "kmq2gamex86.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Lazarus Quake II mod with Threewave/3Team CTF and ACE bot support\0"
VALUE "ProductName", "Lazarus Quake II mod with Threewave/3Team CTF and ACE Bot support\0"
VALUE "ProductVersion", "2.230\0"
VALUE "SpecialBuild", "KMQuake2 v0.20 update 8 compatible version created by Knightmare\0"
END

View file

@ -0,0 +1,142 @@
//Microsoft Developer Studio generated resource script.
//
#include "..\..\win32\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winresrc.h"
#include "winuser.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,2,0,8
PRODUCTVERSION 0,2,0,8
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "Licensed under the GPL. Source available at www.markshan.com/knightmare\0"
VALUE "CompanyName", " \0"
VALUE "FileDescription", "KMQuake2 engine mod (64-bit)\0"
VALUE "FileVersion", "0, 2, 0, 8\0"
VALUE "InternalName", "kmquake2\0"
VALUE "LegalCopyright", "\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "kmquake2_x64.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "KMQuake2\0"
VALUE "ProductVersion", "0, 2, 0, 8\0"
VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
IDB_BITMAP2 BITMAP DISCARDABLE "..\..\win32\startup2.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG1 DIALOGEX 0, 0, 133, 56
STYLE DS_SETFOREGROUND | DS_CENTER | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 16, "Times New Roman", 0, 0, 0x1
BEGIN
CONTROL 115,DLGC_STATIC,"Static",SS_BITMAP,0,0,133,70
END
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON DISCARDABLE "..\..\win32\q2.ico"
IDI_ICON2 ICON DISCARDABLE "..\..\win32\q2mp1.ico"
IDI_ICON3 ICON DISCARDABLE "..\..\win32\q2mp2.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View file

@ -882,11 +882,11 @@
Filter="h;hpp;hxx;hm;inl;fi;fd"
>
<File
RelativePath="..\..\client\anorms.h"
RelativePath="..\..\renderer\anorms.h"
>
</File>
<File
RelativePath="..\..\renderer\anorms.h"
RelativePath="..\..\client\anorms.h"
>
</File>
<File
@ -1017,6 +1017,42 @@
<File
RelativePath=".\kmq2_2008.rc"
>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\kmq2_2008_x64.rc"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\win32\q2.ico"

View file

@ -49,14 +49,14 @@ BEGIN
BEGIN
VALUE "Comments", "Visit our home at http://www.planetquake.com/lazarus\0"
VALUE "CompanyName", "Hyde/Ferrara\0"
VALUE "FileDescription", "Lazarus Quake II mod with CTF support\0"
VALUE "FileDescription", "Lazarus Quake II mod with CTF and ACE Bot\0"
VALUE "FileVersion", "2.230\0"
VALUE "InternalName", "kmq2gamex86.dll\0"
VALUE "LegalCopyright", "Mr. Hyde and Mad Dog\0"
VALUE "LegalTrademarks", "Lazarus is a registered trademark... oops... no it ain't, but don't use it anyway or we'll come get ya.\0"
VALUE "OriginalFilename", "kmq2gamex86.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Lazarus Quake II mod with Threewave/3Team CTF and ACE bot support\0"
VALUE "ProductName", "Lazarus Quake II mod with Threewave/3Team CTF and ACE Bot support\0"
VALUE "ProductVersion", "2.230\0"
VALUE "SpecialBuild", "KMQuake2 v0.20 update 8 compatible version created by Knightmare\0"
END

View file

@ -119,104 +119,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\.."
IntermediateDirectory=".\release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\release/lazarus.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="c:\3dfx\sdk\glide2x\src\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\release/lazarus.pch"
AssemblerListingLocation=".\release/"
ObjectFile=".\release/"
ProgramDataBaseFileName=".\release/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="1"
DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
OutputFile="./kmq2gamex86.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\game\lazarus.def"
ProgramDatabaseFile=".\release/kmq2gamex86.pdb"
SubSystem="2"
BaseAddress="0x20000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary=".\release/kmq2gamex86.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\release/lazarus.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory=".\x64\debug"
@ -320,6 +222,104 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\.."
IntermediateDirectory=".\release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\release/lazarus.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="c:\3dfx\sdk\glide2x\src\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\release/lazarus.pch"
AssemblerListingLocation=".\release/"
ObjectFile=".\release/"
ProgramDataBaseFileName=".\release/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="1"
DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
OutputFile="./kmq2gamex86.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\game\lazarus.def"
ProgramDatabaseFile=".\release/kmq2gamex86.pdb"
SubSystem="2"
BaseAddress="0x20000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary=".\release/kmq2gamex86.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\release/lazarus.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory=".\x64\release"
@ -884,6 +884,42 @@
<File
RelativePath=".\lazarus_2008.rc"
>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\lazarus_2008_x64.rc"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
</File>
</Filter>
</Files>

View file

@ -0,0 +1,115 @@
//Microsoft Developer Studio generated resource script.
//
#include "..\..\game\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#define APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
//qbism #include "ver.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,3,0
PRODUCTVERSION 2,2,3,0
FILEFLAGSMASK 0x2L
#ifdef _DEBUG
FILEFLAGS 0x21L
#else
FILEFLAGS 0x20L
#endif
FILEOS 0x4L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "Visit our home at http://www.planetquake.com/lazarus\0"
VALUE "CompanyName", "Hyde/Ferrara\0"
VALUE "FileDescription", "Lazarus Quake II mod with CTF and ACE Bot (64-bit)\0"
VALUE "FileVersion", "2.230\0"
VALUE "InternalName", "kmq2gamex86.dll\0"
VALUE "LegalCopyright", "Mr. Hyde and Mad Dog\0"
VALUE "LegalTrademarks", "Lazarus is a registered trademark... oops... no it ain't, but don't use it anyway or we'll come get ya.\0"
VALUE "OriginalFilename", "kmq2gamex64.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Lazarus Quake II mod with Threewave/3Team CTF and ACE Bot support\0"
VALUE "ProductVersion", "2.230\0"
VALUE "SpecialBuild", "KMQuake2 v0.20 update 8 compatible version created by Knightmare\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""windows.h""\r\n"
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""ver.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED