aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc/msvc/cgame.vcproj25
-rw-r--r--misc/msvc/game.vcproj29
-rwxr-xr-xmisc/msvc/ioq3.sln4
-rw-r--r--misc/msvc/q3_ui.vcproj44
-rw-r--r--misc/msvc/quake3.vcproj29
-rw-r--r--misc/msvc/ui.vcproj34
6 files changed, 66 insertions, 99 deletions
diff --git a/misc/msvc/cgame.vcproj b/misc/msvc/cgame.vcproj
index 5270f09..2c76c9d 100644
--- a/misc/msvc/cgame.vcproj
+++ b/misc/msvc/cgame.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="cgame"
ProjectGUID="{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
+ RootNamespace="cgame"
>
<Platforms>
<Platform
@@ -46,7 +47,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;MISSIONPACK;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;MISSIONPACK"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -57,6 +58,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="4"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -81,7 +83,7 @@
MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2"
BaseAddress="0x30000000"
- ImportLibrary="$(IntDir)\/cgamex86.lib"
+ ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1"
/>
<Tool
@@ -152,6 +154,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -249,6 +252,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="4"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -344,6 +348,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1495,18 +1500,14 @@
>
</File>
</Filter>
- <File
- RelativePath="..\..\code\cgame\cgame.def"
+ <Filter
+ Name="Resource Files"
>
- <FileConfiguration
- Name="Debug TA|Win32"
- ExcludedFromBuild="true"
+ <File
+ RelativePath=".\cgame.def"
>
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
diff --git a/misc/msvc/game.vcproj b/misc/msvc/game.vcproj
index 667db7c..902fc0b 100644
--- a/misc/msvc/game.vcproj
+++ b/misc/msvc/game.vcproj
@@ -56,6 +56,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -152,6 +153,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -249,6 +251,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="4"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -345,6 +348,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="4"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1754,26 +1758,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\code\game\game.def"
- >
- <FileConfiguration
- Name="Debug TA|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release TA|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\code\qcommon\q_math.c"
>
</File>
@@ -1897,8 +1881,11 @@
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
>
+ <File
+ RelativePath=".\game.def"
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/misc/msvc/ioq3.sln b/misc/msvc/ioq3.sln
index 620d456..13b1bb3 100755
--- a/misc/msvc/ioq3.sln
+++ b/misc/msvc/ioq3.sln
@@ -35,11 +35,9 @@ Global
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|Win32.ActiveCfg = Release|Win32
{F9EE10DA-2404-4154-B904-F93C936C040A}.Release|Win32.Build.0 = Release|Win32
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA|Win32.Build.0 = Debug TA|Win32
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|Win32.ActiveCfg = Debug|Win32
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|Win32.Build.0 = Debug|Win32
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA|Win32.ActiveCfg = Release TA|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA|Win32.Build.0 = Release TA|Win32
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|Win32.ActiveCfg = Release|Win32
{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|Win32.Build.0 = Release|Win32
{81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
@@ -53,11 +51,9 @@ Global
{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA|Win32.Build.0 = Debug TA|Win32
{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug|Win32.ActiveCfg = Debug|Win32
- {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug|Win32.Build.0 = Debug|Win32
{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA|Win32.ActiveCfg = Release TA|Win32
{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA|Win32.Build.0 = Release TA|Win32
{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release|Win32.ActiveCfg = Release|Win32
- {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/misc/msvc/q3_ui.vcproj b/misc/msvc/q3_ui.vcproj
index f671726..812c90a 100644
--- a/misc/msvc/q3_ui.vcproj
+++ b/misc/msvc/q3_ui.vcproj
@@ -46,7 +46,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;MISSIONPACK"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -58,6 +58,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -144,7 +145,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Q3_UI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Q3_UI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;MISSIONPACK"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -155,6 +156,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -249,6 +251,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -341,6 +344,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -488,34 +492,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\code\q3_ui\ui.def"
- >
- <FileConfiguration
- Name="Debug TA|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release TA|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\code\q3_ui\ui_addbots.c"
>
<FileConfiguration
@@ -2475,6 +2451,14 @@
</FileConfiguration>
</File>
</Filter>
+ <Filter
+ Name="Resource Files"
+ >
+ <File
+ RelativePath=".\q3_ui.def"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
diff --git a/misc/msvc/quake3.vcproj b/misc/msvc/quake3.vcproj
index 40b5dc1..dc24966 100644
--- a/misc/msvc/quake3.vcproj
+++ b/misc/msvc/quake3.vcproj
@@ -18,7 +18,7 @@
OutputDirectory="..\..\build\quake3_release_ta"
IntermediateDirectory="..\..\build\quake3_release_ta"
ConfigurationType="1"
- UseOfMFC="0"
+ UseOfMFC="1"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
@@ -46,18 +46,19 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
- PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;USE_OPENAL;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL"
+ AdditionalIncludeDirectories="..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include"
+ PreprocessorDefinitions="_WIN32; WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK"
StringPooling="true"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\quake3.pch"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
- BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -72,10 +73,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="user32.lib advapi32.lib winmm.lib ws2_32.lib openal32.lib SDLmain.lib SDL.lib OpenGL32.lib libcurl.lib"
+ AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib"
OutputFile="$(OutDir)\ioquake3.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
+ GenerateDebugInformation="false"
ProgramDatabaseFile="$(IntDir)\quake3.pdb"
GenerateMapFile="true"
MapFileName="$(IntDir)\quake3.map"
@@ -142,7 +144,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OPENAL;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL"
+ AdditionalIncludeDirectories="..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include"
+ PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\quake3.pch"
@@ -154,6 +157,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -169,7 +173,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="user32.lib advapi32.lib winmm.lib ws2_32.lib openal32.lib SDLmain.lib SDL.lib OpenGL32.lib libcurl.lib"
+ AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib"
OutputFile="$(OutDir)\ioquake3.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -243,7 +247,7 @@
Optimization="2"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\code\SDL12\include; ..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include"
- PreprocessorDefinitions="WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_LOCAL_HEADERS; USE_VOIP; HAVE_CONFIG_H"
+ PreprocessorDefinitions="_WIN32; WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -254,6 +258,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="4"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -272,7 +277,7 @@
OutputFile="$(OutDir)\ioquake3.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
ProgramDatabaseFile="$(IntDir)\quake3.pdb"
GenerateMapFile="true"
MapFileName="$(IntDir)\quake3.map"
@@ -337,7 +342,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OPENAL;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL"
+ AdditionalIncludeDirectories="..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include"
+ PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\quake3.pch"
@@ -349,6 +355,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -364,7 +371,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="user32.lib advapi32.lib winmm.lib ws2_32.lib openal32.lib SDLmain.lib SDL.lib OpenGL32.lib libcurl.lib"
+ AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib"
OutputFile="$(OutDir)\ioquake3.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
diff --git a/misc/msvc/ui.vcproj b/misc/msvc/ui.vcproj
index 039dc36..79e0821 100644
--- a/misc/msvc/ui.vcproj
+++ b/misc/msvc/ui.vcproj
@@ -58,6 +58,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -154,6 +155,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -239,7 +241,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UI_EXPORTS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -250,6 +252,7 @@
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -345,6 +348,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -540,26 +544,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\code\ui\ui.def"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\code\ui\ui_atoms.c"
>
<FileConfiguration
@@ -1020,6 +1004,14 @@
</FileConfiguration>
</File>
</Filter>
+ <Filter
+ Name="Resource Files"
+ >
+ <File
+ RelativePath=".\ui.def"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 20:15:31 +0000