Build system fixes, rename to quake3live, disable hw gamma
- Rename output binary to quake3live.exe (all configurations) - Set TargetName in vcxproj to match OutputFile for AfterBuild copy - Default fs_game to "missionpack" in FS_Startup - Add AfterBuild copy for ui project to workdir/missionpack - Enable q3_ui build for non-TA configs only (TA uses ui project) - Guard hardware gamma with ENABLE_HW_GAMMA macro (disabled by default) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
ba2dbb803e
commit
53dae1453a
6 changed files with 1207 additions and 1175 deletions
|
|
@ -45,8 +45,8 @@ int demo_protocols[] =
|
|||
#define DEF_COMHUNKMEGS "64"
|
||||
#define DEF_COMZONEMEGS "24"
|
||||
#else
|
||||
#define DEF_COMHUNKMEGS "56"
|
||||
#define DEF_COMZONEMEGS "16"
|
||||
#define DEF_COMHUNKMEGS "512"
|
||||
#define DEF_COMZONEMEGS "256"
|
||||
#endif
|
||||
|
||||
int com_argc;
|
||||
|
|
|
|||
|
|
@ -2753,7 +2753,7 @@ static void FS_Startup( const char *gameName ) {
|
|||
homePath = fs_basepath->string;
|
||||
}
|
||||
fs_homepath = Cvar_Get ("fs_homepath", homePath, CVAR_INIT );
|
||||
fs_gamedirvar = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
|
||||
fs_gamedirvar = Cvar_Get ("fs_game", "missionpack", CVAR_INIT|CVAR_SYSTEMINFO );
|
||||
fs_restrict = Cvar_Get ("fs_restrict", "", CVAR_INIT );
|
||||
|
||||
// add search path elements in reverse priority order
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.14.36908.2 d17.14
|
||||
VisualStudioVersion = 17.14.36908.2
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splines", "splines\Splines.vcxproj", "{DBAF2C53-3858-455D-A1AE-3FC093515314}"
|
||||
EndProject
|
||||
|
|
@ -58,10 +58,10 @@ Global
|
|||
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA|x86.Build.0 = Release TA|Win32
|
||||
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|x86.ActiveCfg = Release|Win32
|
||||
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|x86.Build.0 = Release|Win32
|
||||
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA|x86.ActiveCfg = Debug TA|Win32
|
||||
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA|x86.ActiveCfg = Debug|Win32
|
||||
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|x86.Build.0 = Debug|Win32
|
||||
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA|x86.ActiveCfg = Release TA|Win32
|
||||
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA|x86.ActiveCfg = Release|Win32
|
||||
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|x86.ActiveCfg = Release|Win32
|
||||
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|x86.Build.0 = Release|Win32
|
||||
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|x86.ActiveCfg = Debug TA|Win32
|
||||
|
|
|
|||
2345
code/quake3.vcxproj
2345
code/quake3.vcxproj
File diff suppressed because it is too large
Load diff
|
|
@ -560,4 +560,16 @@
|
|||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">
|
||||
<_CopyOutputFile>$(SolutionDir)Debug_TA\uix86.dll</_CopyOutputFile>
|
||||
<_CopyOutputDir>$(SolutionDir)..\workdir\missionpack\</_CopyOutputDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">
|
||||
<_CopyOutputFile>$(SolutionDir)Release_TA\uix86.dll</_CopyOutputFile>
|
||||
<_CopyOutputDir>$(SolutionDir)..\workdir\missionpack\</_CopyOutputDir>
|
||||
</PropertyGroup>
|
||||
<Target Name="AfterBuild" Condition="'$(_CopyOutputFile)' != ''">
|
||||
<MakeDir Directories="$(_CopyOutputDir)" />
|
||||
<Copy SourceFiles="$(_CopyOutputFile)" DestinationFolder="$(_CopyOutputDir)" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -37,6 +37,10 @@ static unsigned short s_oldHardwareGamma[3][256];
|
|||
*/
|
||||
void WG_CheckHardwareGamma( void )
|
||||
{
|
||||
#ifndef ENABLE_HW_GAMMA
|
||||
glConfig.deviceSupportsGamma = qfalse;
|
||||
return;
|
||||
#else
|
||||
HDC hDC;
|
||||
|
||||
glConfig.deviceSupportsGamma = qfalse;
|
||||
|
|
@ -96,6 +100,7 @@ void WG_CheckHardwareGamma( void )
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif // ENABLE_HW_GAMMA
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -131,6 +136,9 @@ void mapGammaMax( void ) {
|
|||
** This routine should only be called if glConfig.deviceSupportsGamma is TRUE
|
||||
*/
|
||||
void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned char blue[256] ) {
|
||||
#ifndef ENABLE_HW_GAMMA
|
||||
return;
|
||||
#else
|
||||
unsigned short table[3][256];
|
||||
int i, j;
|
||||
int ret;
|
||||
|
|
@ -188,6 +196,7 @@ void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned
|
|||
Com_Printf( "SetDeviceGammaRamp failed.\n" );
|
||||
}
|
||||
}
|
||||
#endif // ENABLE_HW_GAMMA
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -195,6 +204,9 @@ void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned
|
|||
*/
|
||||
void WG_RestoreGamma( void )
|
||||
{
|
||||
#ifndef ENABLE_HW_GAMMA
|
||||
return;
|
||||
#else
|
||||
if ( glConfig.deviceSupportsGamma )
|
||||
{
|
||||
if ( qwglSetDeviceGammaRamp3DFX )
|
||||
|
|
@ -210,5 +222,6 @@ void WG_RestoreGamma( void )
|
|||
ReleaseDC( GetDesktopWindow(), hDC );
|
||||
}
|
||||
}
|
||||
#endif // ENABLE_HW_GAMMA
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue