Compare commits
2 commits
slopmaster
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b9a0ada275 | ||
|
|
a82244334c |
6 changed files with 43 additions and 31 deletions
19
.gitignore
vendored
19
.gitignore
vendored
|
|
@ -6,9 +6,6 @@
|
||||||
*.ncb
|
*.ncb
|
||||||
*.sdf
|
*.sdf
|
||||||
*.opensdf
|
*.opensdf
|
||||||
*.pdb
|
|
||||||
*.ilk
|
|
||||||
*.exp
|
|
||||||
*.idb
|
*.idb
|
||||||
UpgradeLog*.htm
|
UpgradeLog*.htm
|
||||||
_UpgradeReport_Files/
|
_UpgradeReport_Files/
|
||||||
|
|
@ -16,10 +13,15 @@ Backup/
|
||||||
|
|
||||||
# Build output directories
|
# Build output directories
|
||||||
Debug/
|
Debug/
|
||||||
|
Debug_TA/
|
||||||
|
Debug TA/
|
||||||
Release/
|
Release/
|
||||||
Release_TA/
|
Release_TA/
|
||||||
|
Release TA/
|
||||||
x64/
|
x64/
|
||||||
*___Win32_*/
|
*___Win32_*/
|
||||||
|
ReleaseAXP/
|
||||||
|
DebugAxp/
|
||||||
|
|
||||||
# Intermediate build files
|
# Intermediate build files
|
||||||
*.obj
|
*.obj
|
||||||
|
|
@ -27,12 +29,9 @@ x64/
|
||||||
*.res
|
*.res
|
||||||
*.sbr
|
*.sbr
|
||||||
*.bsc
|
*.bsc
|
||||||
|
*.pdb
|
||||||
|
*.ilk
|
||||||
|
*.exp
|
||||||
|
|
||||||
# Compiled outputs
|
# Working directory (game runtime + copied build outputs)
|
||||||
*.exe
|
|
||||||
*.dll
|
|
||||||
*.lib
|
|
||||||
*.map
|
|
||||||
|
|
||||||
# Working directory (build outputs + game data)
|
|
||||||
workdir/
|
workdir/
|
||||||
|
|
|
||||||
|
|
@ -45,8 +45,8 @@ int demo_protocols[] =
|
||||||
#define DEF_COMHUNKMEGS "64"
|
#define DEF_COMHUNKMEGS "64"
|
||||||
#define DEF_COMZONEMEGS "24"
|
#define DEF_COMZONEMEGS "24"
|
||||||
#else
|
#else
|
||||||
#define DEF_COMHUNKMEGS "56"
|
#define DEF_COMHUNKMEGS "512"
|
||||||
#define DEF_COMZONEMEGS "16"
|
#define DEF_COMZONEMEGS "384"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int com_argc;
|
int com_argc;
|
||||||
|
|
|
||||||
|
|
@ -2753,7 +2753,7 @@ static void FS_Startup( const char *gameName ) {
|
||||||
homePath = fs_basepath->string;
|
homePath = fs_basepath->string;
|
||||||
}
|
}
|
||||||
fs_homepath = Cvar_Get ("fs_homepath", homePath, CVAR_INIT );
|
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 );
|
fs_restrict = Cvar_Get ("fs_restrict", "", CVAR_INIT );
|
||||||
|
|
||||||
// add search path elements in reverse priority order
|
// add search path elements in reverse priority order
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.14.36908.2 d17.14
|
VisualStudioVersion = 17.14.36908.2
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splines", "splines\Splines.vcxproj", "{DBAF2C53-3858-455D-A1AE-3FC093515314}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splines", "splines\Splines.vcxproj", "{DBAF2C53-3858-455D-A1AE-3FC093515314}"
|
||||||
EndProject
|
EndProject
|
||||||
|
|
@ -10,8 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame\cgame.vcxpro
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game\game.vcxproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game\game.vcxproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui\q3_ui.vcxproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcxproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcxproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\renderer.vcxproj", "{AB424155-FBED-4D8D-B007-5B6CF93EA395}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\renderer.vcxproj", "{AB424155-FBED-4D8D-B007-5B6CF93EA395}"
|
||||||
|
|
@ -58,12 +56,6 @@ Global
|
||||||
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA|x86.Build.0 = Release TA|Win32
|
{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.ActiveCfg = Release|Win32
|
||||||
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|x86.Build.0 = 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|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|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
|
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|x86.ActiveCfg = Debug TA|Win32
|
||||||
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|x86.Build.0 = Debug TA|Win32
|
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|x86.Build.0 = Debug TA|Win32
|
||||||
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug|x86.ActiveCfg = Debug|Win32
|
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug|x86.ActiveCfg = Debug|Win32
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,7 @@
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_ProjectFileVersion>17.0.36804.4</_ProjectFileVersion>
|
<_ProjectFileVersion>17.0.36804.4</_ProjectFileVersion>
|
||||||
|
<TargetName>quake3live</TargetName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">
|
||||||
<OutDir>.\Release_TA\</OutDir>
|
<OutDir>.\Release_TA\</OutDir>
|
||||||
|
|
@ -146,7 +147,7 @@
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<PreprocessorDefinitions>_WIN32;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>DLL_ONLY;_WIN32;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<StringPooling>true</StringPooling>
|
<StringPooling>true</StringPooling>
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
|
@ -161,7 +162,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>.\Release_TA/quake3.exe</OutputFile>
|
<OutputFile>.\Release_TA/quake3live.exe</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<ProgramDatabaseFile>Release_TA/quake3.pdb</ProgramDatabaseFile>
|
<ProgramDatabaseFile>Release_TA/quake3.pdb</ProgramDatabaseFile>
|
||||||
<GenerateMapFile>true</GenerateMapFile>
|
<GenerateMapFile>true</GenerateMapFile>
|
||||||
|
|
@ -205,7 +206,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>.\Debug/quake3.exe</OutputFile>
|
<OutputFile>.\Debug/quake3live.exe</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<ProgramDatabaseFile>.\Debug/quake3.pdb</ProgramDatabaseFile>
|
<ProgramDatabaseFile>.\Debug/quake3.pdb</ProgramDatabaseFile>
|
||||||
|
|
@ -252,7 +253,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>.\quake3___Win32_Release_TA_DEMO/quake3.exe</OutputFile>
|
<OutputFile>.\quake3___Win32_Release_TA_DEMO/quake3live.exe</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<ProgramDatabaseFile>Release_TA/quake3.pdb</ProgramDatabaseFile>
|
<ProgramDatabaseFile>Release_TA/quake3.pdb</ProgramDatabaseFile>
|
||||||
|
|
@ -293,7 +294,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>.\Release/quake3.exe</OutputFile>
|
<OutputFile>.\Release/quake3live.exe</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<ProgramDatabaseFile>.\Release/quake3.pdb</ProgramDatabaseFile>
|
<ProgramDatabaseFile>.\Release/quake3.pdb</ProgramDatabaseFile>
|
||||||
|
|
@ -334,7 +335,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>.\quake3___Win32_Debug_TA_DEMO/quake3.exe</OutputFile>
|
<OutputFile>.\quake3___Win32_Debug_TA_DEMO/quake3live.exe</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<ProgramDatabaseFile>.\quake3___Win32_Debug_TA_DEMO/quake3.pdb</ProgramDatabaseFile>
|
<ProgramDatabaseFile>.\quake3___Win32_Debug_TA_DEMO/quake3.pdb</ProgramDatabaseFile>
|
||||||
|
|
@ -378,7 +379,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>.\quake3___Win32_vector0/quake3.exe</OutputFile>
|
<OutputFile>.\quake3___Win32_vector0/quake3live.exe</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<ProgramDatabaseFile>Release_TA/quake3.pdb</ProgramDatabaseFile>
|
<ProgramDatabaseFile>Release_TA/quake3.pdb</ProgramDatabaseFile>
|
||||||
|
|
@ -404,7 +405,7 @@
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>DLL_ONLY;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||||
<PrecompiledHeader />
|
<PrecompiledHeader />
|
||||||
<PrecompiledHeaderOutputFile>.\Debug_TA/quake3.pch</PrecompiledHeaderOutputFile>
|
<PrecompiledHeaderOutputFile>.\Debug_TA/quake3.pch</PrecompiledHeaderOutputFile>
|
||||||
|
|
@ -419,7 +420,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>dinput8.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>.\Debug_TA/quake3.exe</OutputFile>
|
<OutputFile>.\Debug_TA/quake3live.exe</OutputFile>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<ProgramDatabaseFile>.\Debug_TA/quake3.pdb</ProgramDatabaseFile>
|
<ProgramDatabaseFile>.\Debug_TA/quake3.pdb</ProgramDatabaseFile>
|
||||||
|
|
|
||||||
|
|
@ -560,4 +560,24 @@
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<_CopyOutputFile>$(SolutionDir)Debug\uix86_new.dll</_CopyOutputFile>
|
||||||
|
<_CopyOutputDir>$(SolutionDir)..\workdir\baseq3\</_CopyOutputDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<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|Win32'">
|
||||||
|
<_CopyOutputFile>$(SolutionDir)Release\uix86_new.dll</_CopyOutputFile>
|
||||||
|
<_CopyOutputDir>$(SolutionDir)..\workdir\baseq3\</_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>
|
</Project>
|
||||||
Loading…
Reference in a new issue