From 53dae1453a309549bc9de43dd2fdee82f89b6a34 Mon Sep 17 00:00:00 2001 From: serge_shubin Date: Fri, 20 Mar 2026 13:20:42 +0800 Subject: [PATCH] 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) --- code/qcommon/common.c | 4 +- code/qcommon/files.c | 2 +- code/quake3.sln | 6 +- code/quake3.vcxproj | 2345 ++++++++++++++++++++-------------------- code/ui/ui.vcxproj | 12 + code/win32/win_gamma.c | 13 + 6 files changed, 1207 insertions(+), 1175 deletions(-) diff --git a/code/qcommon/common.c b/code/qcommon/common.c index 24acc5b..eea0c12 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -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; diff --git a/code/qcommon/files.c b/code/qcommon/files.c index f27d2f2..4c325bb 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -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 diff --git a/code/quake3.sln b/code/quake3.sln index 0c2c4a9..9e58a30 100644 --- a/code/quake3.sln +++ b/code/quake3.sln @@ -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 diff --git a/code/quake3.vcxproj b/code/quake3.vcxproj index d306c62..5f9e179 100644 --- a/code/quake3.vcxproj +++ b/code/quake3.vcxproj @@ -1,1170 +1,1177 @@ - - - - - Debug TA DEMO - Win32 - - - Debug TA - Win32 - - - Debug - Win32 - - - Release TA DEMO - Win32 - - - Release TA - Win32 - - - Release - Win32 - - - vector - Win32 - - - - 17.0 - "$/MissionPack/code", CAAAAAAA - - . - MSSCCI:Perforce SCM - {81CB51C4-B434-4E12-B69B-BAEE102F2852} - - - - Application - v143 - false - - - Application - v143 - false - - - Application - v143 - false - - - Application - v143 - false - - - Application - v143 - false - - - Application - v143 - false - - - Application - v143 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>17.0.36804.4 - - - .\Release_TA\ - .\Release_TA\ - false - - - .\Debug\ - .\Debug\ - true - - - .\quake3___Win32_Release_TA_DEMO\ - .\quake3___Win32_Release_TA_DEMO\ - false - - - .\Release\ - .\Release\ - false - - - .\quake3___Win32_Debug_TA_DEMO\ - .\quake3___Win32_Debug_TA_DEMO\ - true - - - .\quake3___Win32_vector0\ - .\quake3___Win32_vector0\ - false - - - .\Debug_TA\ - .\Debug_TA\ - true - - - - DLL_ONLY;%(PreprocessorDefinitions) - - - - - MaxSpeed - AnySuitable - _WIN32;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - .\Release_TA/quake3.pch - .\Release_TA/ - .\Release_TA/ - .\Release_TA/ - true - Level4 - true - - - dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) - .\Release_TA/quake3.exe - true - Release_TA/quake3.pdb - true - Release_TA/quake3.map - Windows - 8388608 - MachineX86 - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release_TA/quake3.tlb - - - - Post build processing.. - rem bash -c "perl ./unix/cons -- release-TA" - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebug - - .\Debug/quake3.pch - .\Debug/ - .\Debug/ - .\Debug/ - true - .\Debug/ - Level3 - true - EditAndContinue - - - dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) - .\Debug/quake3.exe - true - true - .\Debug/quake3.pdb - true - .\Debug/quake3.map - Windows - 8388608 - MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/quake3.tlb - - - - Post build processing.. - rem bash -c "perl ./unix/cons -- debug" - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - win32\winquake.res - - - - - MaxSpeed - AnySuitable - _WIN32;WIN32;NDEBUG;_WINDOWS;PRE_RELEASE_TADEMO;PRE_RELEASE_DEMO;%(PreprocessorDefinitions) - true - MultiThreaded - true - - .\quake3___Win32_Release_TA_DEMO/quake3.pch - .\quake3___Win32_Release_TA_DEMO/ - .\quake3___Win32_Release_TA_DEMO/ - .\quake3___Win32_Release_TA_DEMO/ - Level4 - true - OldStyle - - - dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) - .\quake3___Win32_Release_TA_DEMO/quake3.exe - true - true - Release_TA/quake3.pdb - true - Release_TA/quake3.map - Windows - 8388608 - MachineX86 - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\quake3___Win32_Release_TA_DEMO/quake3.tlb - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - MaxSpeed - AnySuitable - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - .\Release/quake3.pch - .\Release/ - .\Release/ - .\Release/ - Level4 - true - - - dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) - .\Release/quake3.exe - true - true - .\Release/quake3.pdb - true - .\Release/quake3.map - Windows - 8388608 - MachineX86 - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/quake3.tlb - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;PRE_RELEASE_TADEMO;PRE_RELEASE_DEMO;%(PreprocessorDefinitions) - MultiThreadedDebug - - .\quake3___Win32_Debug_TA_DEMO/quake3.pch - .\quake3___Win32_Debug_TA_DEMO/ - .\quake3___Win32_Debug_TA_DEMO/ - .\quake3___Win32_Debug_TA_DEMO/ - true - .\quake3___Win32_Debug_TA_DEMO/ - Level3 - true - EditAndContinue - - - dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) - .\quake3___Win32_Debug_TA_DEMO/quake3.exe - true - true - .\quake3___Win32_Debug_TA_DEMO/quake3.pdb - true - Debug_TA/quake3.map - Windows - 8388608 - MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\quake3___Win32_Debug_TA_DEMO/quake3.tlb - - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - win32\winquake.res - - - - - /vec /vec:stats /vec:pii /vec:o10 /vec:yes %(AdditionalOptions) - MaxSpeed - AnySuitable - _WIN32;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - .\quake3___Win32_vector0/quake3.pch - .\quake3___Win32_vector0/ - .\quake3___Win32_vector0/ - .\quake3___Win32_vector0/ - Level4 - true - ProgramDatabase - - - dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) - .\quake3___Win32_vector0/quake3.exe - true - true - Release_TA/quake3.pdb - true - Release_TA/quake3.map - Windows - 8388608 - MachineX86 - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\quake3___Win32_vector0/quake3.tlb - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebug - - .\Debug_TA/quake3.pch - .\Debug_TA/ - .\Debug_TA/ - .\Debug_TA/ - true - .\Debug_TA/ - Level3 - true - EditAndContinue - - - dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) - .\Debug_TA/quake3.exe - true - true - .\Debug_TA/quake3.pdb - true - Debug_TA/quake3.map - Windows - 8388608 - MachineX86 - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug_TA/quake3.tlb - - - - Post build processing.. - rem bash -c "perl ./unix/cons -- debug-TA" - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - win32\winquake.res - - - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - Disabled - true - Disabled - true - Disabled - true - MaxSpeed - MaxSpeed - true - MaxSpeed - MaxSpeed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - win32;%(AdditionalIncludeDirectories) - win32;%(AdditionalIncludeDirectories) - win32;%(AdditionalIncludeDirectories) - win32;%(AdditionalIncludeDirectories) - win32;%(AdditionalIncludeDirectories) - win32;%(AdditionalIncludeDirectories) - win32;%(AdditionalIncludeDirectories) - - - - - {a410161f-ae9f-485d-a01f-5294891430a6} - false - - - {ab424155-fbed-4d8d-b007-5b6cf93ea395} - false - - - {dbaf2c53-3858-455d-a1ae-3fc093515314} - false - - - - - - - - - + + + + + Debug TA DEMO + Win32 + + + Debug TA + Win32 + + + Debug + Win32 + + + Release TA DEMO + Win32 + + + Release TA + Win32 + + + Release + Win32 + + + vector + Win32 + + + + 17.0 + "$/MissionPack/code", CAAAAAAA + + . + MSSCCI:Perforce SCM + {81CB51C4-B434-4E12-B69B-BAEE102F2852} + + + + Application + v143 + false + + + Application + v143 + false + + + Application + v143 + false + + + Application + v143 + false + + + Application + v143 + false + + + Application + v143 + false + + + Application + v143 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>17.0.36804.4 + + + .\Release_TA\ + .\Release_TA\ + false + quake3live + + + .\Debug\ + .\Debug\ + true + quake3live + + + .\quake3___Win32_Release_TA_DEMO\ + .\quake3___Win32_Release_TA_DEMO\ + false + quake3live + + + .\Release\ + .\Release\ + false + quake3live + + + .\quake3___Win32_Debug_TA_DEMO\ + .\quake3___Win32_Debug_TA_DEMO\ + true + quake3live + + + .\quake3___Win32_vector0\ + .\quake3___Win32_vector0\ + false + quake3live + + + .\Debug_TA\ + .\Debug_TA\ + true + quake3live + + + + DLL_ONLY;%(PreprocessorDefinitions) + + + + + MaxSpeed + AnySuitable + _WIN32;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\Release_TA/quake3live.pch + .\Release_TA/ + .\Release_TA/ + .\Release_TA/ + true + Level4 + true + + + dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) + .\Release_TA/quake3live.exe + true + Release_TA/quake3live.pdb + true + Release_TA/quake3live.map + Windows + 8388608 + MachineX86 + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release_TA/quake3.tlb + + + + Post build processing.. + rem bash -c "perl ./unix/cons -- release-TA" + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebug + + .\Debug/quake3live.pch + .\Debug/ + .\Debug/ + .\Debug/ + true + .\Debug/ + Level3 + true + EditAndContinue + + + dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) + .\Debug/quake3live.exe + true + true + .\Debug/quake3live.pdb + true + .\Debug/quake3live.map + Windows + 8388608 + MachineX86 + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/quake3.tlb + + + + Post build processing.. + rem bash -c "perl ./unix/cons -- debug" + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + win32\winquake.res + + + + + MaxSpeed + AnySuitable + _WIN32;WIN32;NDEBUG;_WINDOWS;PRE_RELEASE_TADEMO;PRE_RELEASE_DEMO;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\quake3___Win32_Release_TA_DEMO/quake3live.pch + .\quake3___Win32_Release_TA_DEMO/ + .\quake3___Win32_Release_TA_DEMO/ + .\quake3___Win32_Release_TA_DEMO/ + Level4 + true + OldStyle + + + dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) + .\quake3___Win32_Release_TA_DEMO/quake3live.exe + true + true + Release_TA/quake3live.pdb + true + Release_TA/quake3live.map + Windows + 8388608 + MachineX86 + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\quake3___Win32_Release_TA_DEMO/quake3.tlb + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + MaxSpeed + AnySuitable + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\Release/quake3live.pch + .\Release/ + .\Release/ + .\Release/ + Level4 + true + + + dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) + .\Release/quake3live.exe + true + true + .\Release/quake3live.pdb + true + .\Release/quake3live.map + Windows + 8388608 + MachineX86 + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/quake3.tlb + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;PRE_RELEASE_TADEMO;PRE_RELEASE_DEMO;%(PreprocessorDefinitions) + MultiThreadedDebug + + .\quake3___Win32_Debug_TA_DEMO/quake3live.pch + .\quake3___Win32_Debug_TA_DEMO/ + .\quake3___Win32_Debug_TA_DEMO/ + .\quake3___Win32_Debug_TA_DEMO/ + true + .\quake3___Win32_Debug_TA_DEMO/ + Level3 + true + EditAndContinue + + + dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) + .\quake3___Win32_Debug_TA_DEMO/quake3live.exe + true + true + .\quake3___Win32_Debug_TA_DEMO/quake3live.pdb + true + Debug_TA/quake3live.map + Windows + 8388608 + MachineX86 + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\quake3___Win32_Debug_TA_DEMO/quake3.tlb + + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + win32\winquake.res + + + + + /vec /vec:stats /vec:pii /vec:o10 /vec:yes %(AdditionalOptions) + MaxSpeed + AnySuitable + _WIN32;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\quake3___Win32_vector0/quake3live.pch + .\quake3___Win32_vector0/ + .\quake3___Win32_vector0/ + .\quake3___Win32_vector0/ + Level4 + true + ProgramDatabase + + + dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) + .\quake3___Win32_vector0/quake3live.exe + true + true + Release_TA/quake3live.pdb + true + Release_TA/quake3live.map + Windows + 8388608 + MachineX86 + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\quake3___Win32_vector0/quake3.tlb + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebug + + .\Debug_TA/quake3live.pch + .\Debug_TA/ + .\Debug_TA/ + .\Debug_TA/ + true + .\Debug_TA/ + Level3 + true + EditAndContinue + + + dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies) + .\Debug_TA/quake3live.exe + true + true + .\Debug_TA/quake3live.pdb + true + Debug_TA/quake3live.map + Windows + 8388608 + MachineX86 + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug_TA/quake3.tlb + + + + Post build processing.. + rem bash -c "perl ./unix/cons -- debug-TA" + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + win32\winquake.res + + + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + Disabled + true + Disabled + true + Disabled + true + MaxSpeed + MaxSpeed + true + MaxSpeed + MaxSpeed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + win32;%(AdditionalIncludeDirectories) + win32;%(AdditionalIncludeDirectories) + win32;%(AdditionalIncludeDirectories) + win32;%(AdditionalIncludeDirectories) + win32;%(AdditionalIncludeDirectories) + win32;%(AdditionalIncludeDirectories) + win32;%(AdditionalIncludeDirectories) + + + + + {a410161f-ae9f-485d-a01f-5294891430a6} + false + + + {ab424155-fbed-4d8d-b007-5b6cf93ea395} + false + + + {dbaf2c53-3858-455d-a1ae-3fc093515314} + false + + + + + + + + + \ No newline at end of file diff --git a/code/ui/ui.vcxproj b/code/ui/ui.vcxproj index f644c4e..2df2a19 100644 --- a/code/ui/ui.vcxproj +++ b/code/ui/ui.vcxproj @@ -560,4 +560,16 @@ + + <_CopyOutputFile>$(SolutionDir)Debug_TA\uix86.dll + <_CopyOutputDir>$(SolutionDir)..\workdir\missionpack\ + + + <_CopyOutputFile>$(SolutionDir)Release_TA\uix86.dll + <_CopyOutputDir>$(SolutionDir)..\workdir\missionpack\ + + + + + \ No newline at end of file diff --git a/code/win32/win_gamma.c b/code/win32/win_gamma.c index 9b51209..c8a7377 100644 --- a/code/win32/win_gamma.c +++ b/code/win32/win_gamma.c @@ -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 }