commit 81163488c7e68222a2a46959623cfbc4ff49e95f
Author: alexey.lysiuk <alexey.lysiuk@gmail.com>
AuthorDate: Sun May 11 15:50:00 2014 +0300
Commit: alexey.lysiuk <alexey.lysiuk@gmail.com>
CommitDate: Sun May 11 15:50:00 2014 +0300
Update MSVC2008 projects and solution
---
msvc/chocolate.sln | 8 ++
msvc/doom.vcproj | 122 +++++++++++++++++++-------
msvc/heretic.vcproj | 214 ++++++++++++++++++++++++++++++++++++++++++++--
msvc/hexen.vcproj | 121 +++++++++++++++++++++++---
msvc/libtextscreen.vcproj | 21 ++++-
msvc/server.vcproj | 10 +++
msvc/setup.vcproj | 182 ++++++++++++++++++++++++++++++++-------
msvc/strife.vcproj | 13 ++-
8 files changed, 601 insertions(+), 90 deletions(-)
diff --git a/msvc/chocolate.sln b/msvc/chocolate.sln
index 2c9cca8b..d6a62c12 100644
--- a/msvc/chocolate.sln
+++ b/msvc/chocolate.sln
@@ -3,18 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Doom", "doom.vcproj", "{8B744A3B-8F18-41A0-85A3-293816E85B6E}"
ProjectSection(ProjectDependencies) = postProject
+ {FC8D0610-1507-4F36-99BC-6F5A422B6AD3} = {FC8D0610-1507-4F36-99BC-6F5A422B6AD3}
{66CD7F50-73B9-482F-8B69-1AF54983F845} = {66CD7F50-73B9-482F-8B69-1AF54983F845}
{35F435DB-AC4A-4F28-BA2D-812E638FB01A} = {35F435DB-AC4A-4F28-BA2D-812E638FB01A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Heretic", "heretic.vcproj", "{8D4FF322-7414-4668-94BD-D63B45D9CBF8}"
ProjectSection(ProjectDependencies) = postProject
+ {FC8D0610-1507-4F36-99BC-6F5A422B6AD3} = {FC8D0610-1507-4F36-99BC-6F5A422B6AD3}
{66CD7F50-73B9-482F-8B69-1AF54983F845} = {66CD7F50-73B9-482F-8B69-1AF54983F845}
{35F435DB-AC4A-4F28-BA2D-812E638FB01A} = {35F435DB-AC4A-4F28-BA2D-812E638FB01A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hexen", "hexen.vcproj", "{8FBB8720-340B-4185-9442-A76781FD6278}"
ProjectSection(ProjectDependencies) = postProject
+ {FC8D0610-1507-4F36-99BC-6F5A422B6AD3} = {FC8D0610-1507-4F36-99BC-6F5A422B6AD3}
{66CD7F50-73B9-482F-8B69-1AF54983F845} = {66CD7F50-73B9-482F-8B69-1AF54983F845}
{35F435DB-AC4A-4F28-BA2D-812E638FB01A} = {35F435DB-AC4A-4F28-BA2D-812E638FB01A}
EndProjectSection
@@ -31,6 +34,11 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtextscreen", "libtextscreen.vcproj", "{35F435DB-AC4A-4F28-BA2D-812E638FB01A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Strife", "strife.vcproj", "{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FC8D0610-1507-4F36-99BC-6F5A422B6AD3} = {FC8D0610-1507-4F36-99BC-6F5A422B6AD3}
+ {66CD7F50-73B9-482F-8B69-1AF54983F845} = {66CD7F50-73B9-482F-8B69-1AF54983F845}
+ {35F435DB-AC4A-4F28-BA2D-812E638FB01A} = {35F435DB-AC4A-4F28-BA2D-812E638FB01A}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopl", "libopl.vcproj", "{FC8D0610-1507-4F36-99BC-6F5A422B6AD3}"
EndProject
diff --git a/msvc/doom.vcproj b/msvc/doom.vcproj
index c5714eea..16b6537c 100644
--- a/msvc/doom.vcproj
+++ b/msvc/doom.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen;..\pcsound"
+ AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
MinimalRebuild="true"
ExceptionHandling="0"
@@ -69,6 +69,7 @@
AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-doom-dbg.exe"
LinkIncremental="2"
+ IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
SubSystem="1"
DataExecutionPrevention="0"
@@ -123,7 +124,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen;..\pcsound"
+ AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -146,6 +147,7 @@
AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-doom.exe"
LinkIncremental="0"
+ IgnoreDefaultLibraryNames="msvcrtd"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
@@ -192,6 +194,10 @@
RelativePath="..\src\d_iwad.h"
>
</File>
+ <File
+ RelativePath="..\src\d_loop.h"
+ >
+ </File>
<File
RelativePath="..\src\d_mode.h"
>
@@ -200,6 +206,22 @@
RelativePath="..\src\d_ticcmd.h"
>
</File>
+ <File
+ RelativePath="..\src\deh_defs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_io.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_main.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_mapping.h"
+ >
+ </File>
<File
RelativePath="..\src\deh_str.h"
>
@@ -216,6 +238,10 @@
RelativePath="..\src\doomtype.h"
>
</File>
+ <File
+ RelativePath="..\src\gusconf.h"
+ >
+ </File>
<File
RelativePath="..\src\i_cdmus.h"
>
@@ -281,11 +307,11 @@
>
</File>
<File
- RelativePath="..\src\md5.h"
+ RelativePath="..\src\memio.h"
>
</File>
<File
- RelativePath="..\src\memio.h"
+ RelativePath="..\src\midifile.h"
>
</File>
<File
@@ -340,6 +366,10 @@
RelativePath="..\src\net_structrw.h"
>
</File>
+ <File
+ RelativePath="..\src\sha1.h"
+ >
+ </File>
<File
RelativePath="..\src\tables.h"
>
@@ -360,6 +390,10 @@
RelativePath="..\src\w_file.h"
>
</File>
+ <File
+ RelativePath="..\src\w_main.h"
+ >
+ </File>
<File
RelativePath="..\src\w_merge.h"
>
@@ -411,18 +445,6 @@
RelativePath="..\src\doom\deh_defs.h"
>
</File>
- <File
- RelativePath="..\src\doom\deh_io.h"
- >
- </File>
- <File
- RelativePath="..\src\doom\deh_main.h"
- >
- </File>
- <File
- RelativePath="..\src\doom\deh_mapping.h"
- >
- </File>
<File
RelativePath="..\src\doom\deh_misc.h"
>
@@ -567,6 +589,10 @@
RelativePath="..\src\doom\st_stuff.h"
>
</File>
+ <File
+ RelativePath="..\src\doom\statdump.h"
+ >
+ </File>
<File
RelativePath="..\src\doom\wi_stuff.h"
>
@@ -584,14 +610,38 @@
RelativePath="..\src\d_iwad.c"
>
</File>
+ <File
+ RelativePath="..\src\d_loop.c"
+ >
+ </File>
<File
RelativePath="..\src\d_mode.c"
>
</File>
+ <File
+ RelativePath="..\src\deh_io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_main.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_mapping.c"
+ >
+ </File>
<File
RelativePath="..\src\deh_str.c"
>
</File>
+ <File
+ RelativePath="..\src\deh_text.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\gusconf.c"
+ >
+ </File>
<File
RelativePath="..\src\i_cdmus.c"
>
@@ -608,6 +658,10 @@
RelativePath="..\src\i_main.c"
>
</File>
+ <File
+ RelativePath="..\src\i_oplmusic.c"
+ >
+ </File>
<File
RelativePath="..\src\i_pcsound.c"
>
@@ -673,11 +727,11 @@
>
</File>
<File
- RelativePath="..\src\md5.c"
+ RelativePath="..\src\memio.c"
>
</File>
<File
- RelativePath="..\src\memio.c"
+ RelativePath="..\src\midifile.c"
>
</File>
<File
@@ -692,6 +746,10 @@
RelativePath="..\src\net_common.c"
>
</File>
+ <File
+ RelativePath="..\src\net_dedicated.c"
+ >
+ </File>
<File
RelativePath="..\src\net_gui.c"
>
@@ -724,6 +782,10 @@
RelativePath="..\src\net_structrw.c"
>
</File>
+ <File
+ RelativePath="..\src\sha1.c"
+ >
+ </File>
<File
RelativePath="..\src\tables.c"
>
@@ -752,6 +814,10 @@
RelativePath="..\src\w_file_win32.c"
>
</File>
+ <File
+ RelativePath="..\src\w_main.c"
+ >
+ </File>
<File
RelativePath="..\src\w_merge.c"
>
@@ -792,19 +858,11 @@
>
</File>
<File
- RelativePath="..\src\doom\deh_frame.c"
- >
- </File>
- <File
- RelativePath="..\src\doom\deh_io.c"
+ RelativePath="..\src\doom\deh_doom.c"
>
</File>
<File
- RelativePath="..\src\doom\deh_main.c"
- >
- </File>
- <File
- RelativePath="..\src\doom\deh_mapping.c"
+ RelativePath="..\src\doom\deh_frame.c"
>
</File>
<File
@@ -819,10 +877,6 @@
RelativePath="..\src\doom\deh_sound.c"
>
</File>
- <File
- RelativePath="..\src\doom\deh_text.c"
- >
- </File>
<File
RelativePath="..\src\doom\deh_thing.c"
>
@@ -999,6 +1053,10 @@
RelativePath="..\src\doom\st_stuff.c"
>
</File>
+ <File
+ RelativePath="..\src\doom\statdump.c"
+ >
+ </File>
<File
RelativePath="..\src\doom\wi_stuff.c"
>
diff --git a/msvc/heretic.vcproj b/msvc/heretic.vcproj
index e9dbb0dd..a5f775ac 100644
--- a/msvc/heretic.vcproj
+++ b/msvc/heretic.vcproj
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;..\src;..\src\doom;..\src\heretic;..\textscreen;..\pcsound"
+ AdditionalIncludeDirectories=".;..\src;..\src\heretic;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -62,6 +62,7 @@
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-heretic-dbg.exe"
+ IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -115,7 +116,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;..\src;..\src\doom;..\src\heretic;..\textscreen;..\pcsound"
+ AdditionalIncludeDirectories=".;..\src;..\src\heretic;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
StringPooling="true"
ExceptionHandling="0"
@@ -138,6 +139,7 @@
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-heretic.exe"
+ IgnoreDefaultLibraryNames="msvcrtd"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
@@ -183,14 +185,38 @@
RelativePath="..\src\d_iwad.c"
>
</File>
+ <File
+ RelativePath="..\src\d_loop.c"
+ >
+ </File>
<File
RelativePath="..\src\d_mode.c"
>
</File>
+ <File
+ RelativePath="..\src\deh_io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_main.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_mapping.c"
+ >
+ </File>
<File
RelativePath="..\src\deh_str.c"
>
</File>
+ <File
+ RelativePath="..\src\deh_text.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\gusconf.c"
+ >
+ </File>
<File
RelativePath="..\src\i_cdmus.c"
>
@@ -207,6 +233,10 @@
RelativePath="..\src\i_main.c"
>
</File>
+ <File
+ RelativePath="..\src\i_oplmusic.c"
+ >
+ </File>
<File
RelativePath="..\src\i_pcsound.c"
>
@@ -272,17 +302,65 @@
>
</File>
<File
- RelativePath="..\src\md5.c"
+ RelativePath="..\src\memio.c"
>
</File>
<File
- RelativePath="..\src\memio.c"
+ RelativePath="..\src\midifile.c"
>
</File>
<File
RelativePath="..\src\mus2mid.c"
>
</File>
+ <File
+ RelativePath="..\src\net_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_common.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_dedicated.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_gui.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_loop.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_packet.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_query.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_sdl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_server.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_structrw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\sha1.c"
+ >
+ </File>
<File
RelativePath="..\src\tables.c"
>
@@ -311,6 +389,10 @@
RelativePath="..\src\w_file_win32.c"
>
</File>
+ <File
+ RelativePath="..\src\w_main.c"
+ >
+ </File>
<File
RelativePath="..\src\w_merge.c"
>
@@ -342,6 +424,34 @@
RelativePath="..\src\heretic\d_net.c"
>
</File>
+ <File
+ RelativePath="..\src\heretic\deh_ammo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\heretic\deh_frame.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\heretic\deh_htext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\heretic\deh_htic.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\heretic\deh_sound.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\heretic\deh_thing.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\heretic\deh_weapon.c"
+ >
+ </File>
<File
RelativePath="..\src\heretic\f_finale.c"
>
@@ -414,6 +524,10 @@
RelativePath="..\src\heretic\p_pspr.c"
>
</File>
+ <File
+ RelativePath="..\src\heretic\p_saveg.c"
+ >
+ </File>
<File
RelativePath="..\src\heretic\p_setup.c"
>
@@ -497,6 +611,10 @@
RelativePath="..\src\d_iwad.h"
>
</File>
+ <File
+ RelativePath="..\src\d_loop.h"
+ >
+ </File>
<File
RelativePath="..\src\d_mode.h"
>
@@ -505,6 +623,22 @@
RelativePath="..\src\d_ticcmd.h"
>
</File>
+ <File
+ RelativePath="..\src\deh_defs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_io.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_main.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_mapping.h"
+ >
+ </File>
<File
RelativePath="..\src\deh_str.h"
>
@@ -521,6 +655,10 @@
RelativePath="..\src\doomtype.h"
>
</File>
+ <File
+ RelativePath="..\src\gusconf.h"
+ >
+ </File>
<File
RelativePath="..\src\i_cdmus.h"
>
@@ -582,17 +720,69 @@
>
</File>
<File
- RelativePath="..\src\md5.h"
+ RelativePath="..\src\memio.h"
>
</File>
<File
- RelativePath="..\src\memio.h"
+ RelativePath="..\src\midifile.h"
>
</File>
<File
RelativePath="..\src\mus2mid.h"
>
</File>
+ <File
+ RelativePath="..\src\net_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_common.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_dedicated.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_defs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_gui.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_io.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_loop.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_packet.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_query.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_sdl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_server.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_structrw.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\sha1.h"
+ >
+ </File>
<File
RelativePath="..\src\tables.h"
>
@@ -613,6 +803,10 @@
RelativePath="..\src\w_file.h"
>
</File>
+ <File
+ RelativePath="..\src\w_main.h"
+ >
+ </File>
<File
RelativePath="..\src\w_merge.h"
>
@@ -640,6 +834,10 @@
RelativePath="..\src\heretic\ct_chat.h"
>
</File>
+ <File
+ RelativePath="..\src\heretic\deh_htic.h"
+ >
+ </File>
<File
RelativePath="..\src\heretic\doomdata.h"
>
@@ -660,6 +858,10 @@
RelativePath="..\src\heretic\m_random.h"
>
</File>
+ <File
+ RelativePath="..\src\heretic\p_action.h"
+ >
+ </File>
<File
RelativePath="..\src\heretic\p_local.h"
>
diff --git a/msvc/hexen.vcproj b/msvc/hexen.vcproj
index 42a7b2c3..86dc2e54 100644
--- a/msvc/hexen.vcproj
+++ b/msvc/hexen.vcproj
@@ -40,11 +40,11 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound;..\opl"
+ AdditionalIncludeDirectories=".;..\src;..\src\hexen;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="2"
+ RuntimeLibrary="3"
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
@@ -60,10 +60,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib ..\lib\libopl.lib"
+ AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-hexen-dbg.exe"
IgnoreAllDefaultLibraries="false"
- IgnoreDefaultLibraryNames="msvcrtd.lib"
+ IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;..\src;..\src\doom;..\src\heretic;..\textscreen;..\pcsound"
+ AdditionalIncludeDirectories=".;..\src;..\src\hexen;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
StringPooling="true"
ExceptionHandling="0"
@@ -140,6 +140,7 @@
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-hexen.exe"
+ IgnoreDefaultLibraryNames="msvcrtd"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
@@ -185,6 +186,10 @@
RelativePath="..\src\d_iwad.c"
>
</File>
+ <File
+ RelativePath="..\src\d_loop.c"
+ >
+ </File>
<File
RelativePath="..\src\d_mode.c"
>
@@ -193,6 +198,10 @@
RelativePath="..\src\deh_str.c"
>
</File>
+ <File
+ RelativePath="..\src\gusconf.c"
+ >
+ </File>
<File
RelativePath="..\src\i_cdmus.c"
>
@@ -277,10 +286,6 @@
RelativePath="..\src\m_misc.c"
>
</File>
- <File
- RelativePath="..\src\md5.c"
- >
- </File>
<File
RelativePath="..\src\memio.c"
>
@@ -293,6 +298,50 @@
RelativePath="..\src\mus2mid.c"
>
</File>
+ <File
+ RelativePath="..\src\net_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_common.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_gui.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_loop.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_packet.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_query.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_sdl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_server.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_structrw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\sha1.c"
+ >
+ </File>
<File
RelativePath="..\src\tables.c"
>
@@ -551,6 +600,10 @@
RelativePath="..\src\d_iwad.h"
>
</File>
+ <File
+ RelativePath="..\src\d_loop.h"
+ >
+ </File>
<File
RelativePath="..\src\d_mode.h"
>
@@ -575,6 +628,10 @@
RelativePath="..\src\doomtype.h"
>
</File>
+ <File
+ RelativePath="..\src\gusconf.h"
+ >
+ </File>
<File
RelativePath="..\src\i_cdmus.h"
>
@@ -640,15 +697,55 @@
>
</File>
<File
- RelativePath="..\src\md5.h"
+ RelativePath="..\src\memio.h"
>
</File>
<File
- RelativePath="..\src\memio.h"
+ RelativePath="..\src\mus2mid.h"
>
</File>
<File
- RelativePath="..\src\mus2mid.h"
+ RelativePath="..\src\net_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_common.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_gui.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_io.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_loop.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_packet.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_query.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_sdl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_server.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_structrw.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\sha1.h"
>
</File>
<File
diff --git a/msvc/libtextscreen.vcproj b/msvc/libtextscreen.vcproj
index 3489cd77..e3e7bdaa 100644
--- a/msvc/libtextscreen.vcproj
+++ b/msvc/libtextscreen.vcproj
@@ -131,7 +131,6 @@
/>
<Tool
Name="VCLibrarianTool"
- IgnoreDefaultLibraryNames="msvcrtd"
/>
<Tool
Name="VCALinkTool"
@@ -174,6 +173,10 @@
RelativePath="..\textscreen\txt_dropdown.c"
>
</File>
+ <File
+ RelativePath="..\textscreen\txt_fileselect.c"
+ >
+ </File>
<File
RelativePath="..\textscreen\txt_gui.c"
>
@@ -194,6 +197,10 @@
RelativePath="..\textscreen\txt_radiobutton.c"
>
</File>
+ <File
+ RelativePath="..\textscreen\txt_scrollpane.c"
+ >
+ </File>
<File
RelativePath="..\textscreen\txt_sdl.c"
>
@@ -256,6 +263,10 @@
RelativePath="..\textscreen\txt_dropdown.h"
>
</File>
+ <File
+ RelativePath="..\textscreen\txt_fileselect.h"
+ >
+ </File>
<File
RelativePath="..\textscreen\txt_font.h"
>
@@ -288,6 +299,10 @@
RelativePath="..\textscreen\txt_radiobutton.h"
>
</File>
+ <File
+ RelativePath="..\textscreen\txt_scrollpane.h"
+ >
+ </File>
<File
RelativePath="..\textscreen\txt_sdl.h"
>
@@ -296,6 +311,10 @@
RelativePath="..\textscreen\txt_separator.h"
>
</File>
+ <File
+ RelativePath="..\textscreen\txt_smallfont.h"
+ >
+ </File>
<File
RelativePath="..\textscreen\txt_spinctrl.h"
>
diff --git a/msvc/server.vcproj b/msvc/server.vcproj
index d692267f..0f4e9e62 100644
--- a/msvc/server.vcproj
+++ b/msvc/server.vcproj
@@ -63,6 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-server-dbg.exe"
+ IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -140,6 +141,7 @@
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-server.exe"
+ IgnoreDefaultLibraryNames="msvcrtd"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
@@ -221,6 +223,10 @@
RelativePath="..\src\net_packet.c"
>
</File>
+ <File
+ RelativePath="..\src\net_query.c"
+ >
+ </File>
<File
RelativePath="..\src\net_sdl.c"
>
@@ -279,6 +285,10 @@
RelativePath="..\src\net_packet.h"
>
</File>
+ <File
+ RelativePath="..\src\net_query.h"
+ >
+ </File>
<File
RelativePath="..\src\net_sdl.h"
>
diff --git a/msvc/setup.vcproj b/msvc/setup.vcproj
index 5e2a2efe..342b55c5 100644
--- a/msvc/setup.vcproj
+++ b/msvc/setup.vcproj
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen"
+ AdditionalIncludeDirectories=".;..\src;..\textscreen"
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;CHOCOLATESETUP"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -61,8 +61,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDLmain.lib"
+ AdditionalDependencies="SDL.lib SDLmain.lib SDL_net.lib"
OutputFile="$(OutDir)\chocolate-setup-dbg.exe"
+ IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -116,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen"
+ AdditionalIncludeDirectories=".;..\src;..\textscreen"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;CHOCOLATESETUP"
StringPooling="true"
ExceptionHandling="0"
@@ -138,8 +139,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDLmain.lib"
+ AdditionalDependencies="SDL.lib SDLmain.lib SDL_net.lib"
OutputFile="$(OutDir)\chocolate-setup.exe"
+ IgnoreDefaultLibraryNames="msvcrtd"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
@@ -178,69 +180,129 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\setup\compatibility.c"
+ RelativePath="..\src\setup\compatibility.c"
>
</File>
<File
- RelativePath="..\setup\configfile.c"
+ RelativePath="..\src\d_iwad.c"
>
</File>
<File
- RelativePath="..\setup\display.c"
+ RelativePath="..\src\d_mode.c"
>
</File>
<File
- RelativePath="..\setup\execute.c"
+ RelativePath="..\src\deh_str.c"
>
</File>
<File
- RelativePath="..\setup\joystick.c"
+ RelativePath="..\src\setup\display.c"
>
</File>
<File
- RelativePath="..\setup\keyboard.c"
+ RelativePath="..\src\setup\execute.c"
>
</File>
<File
- RelativePath="..\setup\m_argv.c"
+ RelativePath="..\src\i_main.c"
>
</File>
<File
- RelativePath="..\setup\mainmenu.c"
+ RelativePath="..\src\i_system.c"
>
</File>
<File
- RelativePath="..\setup\mouse.c"
+ RelativePath="..\src\i_timer.c"
>
</File>
<File
- RelativePath="..\setup\multiplayer.c"
+ RelativePath="..\src\setup\joystick.c"
>
</File>
<File
- RelativePath="..\setup\setup_icon.c"
+ RelativePath="..\src\setup\keyboard.c"
>
</File>
<File
- RelativePath="..\setup\sound.c"
+ RelativePath="..\src\m_argv.c"
>
</File>
<File
- RelativePath="..\setup\txt_joybinput.c"
+ RelativePath="..\src\m_config.c"
>
</File>
<File
- RelativePath="..\setup\txt_keyinput.c"
+ RelativePath="..\src\m_controls.c"
>
</File>
<File
- RelativePath="..\setup\txt_mouseinput.c"
+ RelativePath="..\src\m_misc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\mainmenu.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\mode.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\mouse.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\multiplayer.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_packet.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_query.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_sdl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_structrw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\setup_icon.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\sound.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\txt_joybinput.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\txt_keyinput.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\txt_mouseinput.c"
>
</File>
<File
RelativePath="..\textscreen\txt_scrollpane.c"
>
</File>
+ <File
+ RelativePath="..\src\z_zone.c"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -248,61 +310,117 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\setup\compatibility.h"
+ RelativePath="..\src\setup\compatibility.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\d_iwad.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\d_mode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_str.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\display.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\execute.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_system.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_timer.h"
>
</File>
<File
- RelativePath="..\setup\configfile.h"
+ RelativePath="..\src\setup\joystick.h"
>
</File>
<File
- RelativePath="..\setup\display.h"
+ RelativePath="..\src\setup\keyboard.h"
>
</File>
<File
- RelativePath="..\setup\execute.h"
+ RelativePath="..\src\m_argv.h"
>
</File>
<File
- RelativePath="..\setup\joystick.h"
+ RelativePath="..\src\m_config.h"
>
</File>
<File
- RelativePath="..\setup\keyboard.h"
+ RelativePath="..\src\m_controls.h"
>
</File>
<File
- RelativePath="..\setup\m_argv.h"
+ RelativePath="..\src\m_misc.h"
>
</File>
<File
- RelativePath="..\setup\mouse.h"
+ RelativePath="..\src\setup\mode.h"
>
</File>
<File
- RelativePath="..\setup\multiplayer.h"
+ RelativePath="..\src\setup\mouse.h"
>
</File>
<File
- RelativePath="..\setup\sound.h"
+ RelativePath="..\src\setup\multiplayer.h"
>
</File>
<File
- RelativePath="..\setup\txt_joybinput.h"
+ RelativePath="..\src\net_io.h"
>
</File>
<File
- RelativePath="..\setup\txt_keyinput.h"
+ RelativePath="..\src\net_packet.h"
>
</File>
<File
- RelativePath="..\setup\txt_mouseinput.h"
+ RelativePath="..\src\net_query.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_sdl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_structrw.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\sound.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\txt_joybinput.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\txt_keyinput.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\setup\txt_mouseinput.h"
>
</File>
<File
RelativePath="..\textscreen\txt_scrollpane.h"
>
</File>
+ <File
+ RelativePath="..\src\z_zone.h"
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
diff --git a/msvc/strife.vcproj b/msvc/strife.vcproj
index f3827be4..ebb595fe 100644
--- a/msvc/strife.vcproj
+++ b/msvc/strife.vcproj
@@ -41,12 +41,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound;..\opl"
+ AdditionalIncludeDirectories=".;..\src;..\src\strife;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
MinimalRebuild="true"
ExceptionHandling="0"
BasicRuntimeChecks="3"
- RuntimeLibrary="2"
+ RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
ExpandAttributedSource="true"
@@ -66,11 +66,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib ..\lib\libopl.lib"
+ AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-strife-dbg.exe"
LinkIncremental="2"
- IgnoreAllDefaultLibraries="false"
- IgnoreDefaultLibraryNames="msvcrtd.lib"
+ IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
SubSystem="1"
DataExecutionPrevention="0"
@@ -129,7 +128,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound;..\opl"
+ AdditionalIncludeDirectories=".;..\src;..\src\strife;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -149,7 +148,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib ..\lib\libopl.lib"
+ AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
OutputFile="$(OutDir)\chocolate-strife.exe"
LinkIncremental="0"
IgnoreDefaultLibraryNames="msvcrtd"