VC++ Project now builds

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1127

1 files changed, 125 insertions, 673 deletions

diff --git a/msvc/ChocolateDoom.vcproj b/msvc/ChocolateDoom.vcproj
index d2eb2735..2660de5d 100644
--- a/msvc/ChocolateDoom.vcproj
+++ b/msvc/ChocolateDoom.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="Chocolate Doom"

 	ProjectGUID="{8B744A3B-8F18-41A0-85A3-293816E85B6E}"

 	RootNamespace="ChocolateDoom"

@@ -502,42 +502,6 @@
 			Name="Source"

 			>

 			<File

-				RelativePath="..\src\icon.c"

-				>

-				<FileConfiguration

-					Name="Debug Server|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Server|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\src\doomdata.h"

 				>

 				<FileConfiguration

@@ -896,6 +860,42 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\icon.c"

+				>

+				<FileConfiguration

+					Name="Debug Server|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Server|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Setup|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Setup|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\info.c"

 				>

 				<FileConfiguration

@@ -1426,20 +1426,6 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3028,20 +3014,6 @@
 					RelativePath="..\src\i_main.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3350,20 +3322,6 @@
 					RelativePath="..\src\i_timer.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3494,20 +3452,6 @@
 					RelativePath="..\src\m_argv.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3703,7 +3647,7 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\m_fixed.c"

+					RelativePath="..\src\m_config.c"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

@@ -3739,7 +3683,7 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\m_fixed.h"

+					RelativePath="..\src\m_config.h"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

@@ -3775,7 +3719,7 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\m_menu.c"

+					RelativePath="..\src\m_fixed.c"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

@@ -3811,7 +3755,7 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\m_menu.h"

+					RelativePath="..\src\m_fixed.h"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

@@ -3847,7 +3791,7 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\m_misc.c"

+					RelativePath="..\src\m_menu.c"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

@@ -3883,7 +3827,7 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\m_misc.h"

+					RelativePath="..\src\m_menu.h"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

@@ -3919,11 +3863,10 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\m_random.c"

+					RelativePath="..\src\m_misc.c"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

-						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCLCompilerTool"

@@ -3931,7 +3874,6 @@
 					</FileConfiguration>

 					<FileConfiguration

 						Name="Release Server|Win32"

-						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCLCompilerTool"

@@ -3955,11 +3897,10 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\m_random.h"

+					RelativePath="..\src\m_misc.h"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

-						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCustomBuildTool"

@@ -3967,7 +3908,6 @@
 					</FileConfiguration>

 					<FileConfiguration

 						Name="Release Server|Win32"

-						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCustomBuildTool"

@@ -3990,12 +3930,8 @@
 						/>

 					</FileConfiguration>

 				</File>

-			</Filter>

-			<Filter

-				Name="net_"

-				>

 				<File

-					RelativePath="..\src\net_client.c"

+					RelativePath="..\src\m_random.c"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

@@ -4031,7 +3967,7 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\net_client.h"

+					RelativePath="..\src\m_random.h"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

@@ -4066,11 +4002,16 @@
 						/>

 					</FileConfiguration>

 				</File>

+			</Filter>

+			<Filter

+				Name="net_"

+				>

 				<File

-					RelativePath="..\src\net_common.c"

+					RelativePath="..\src\net_client.c"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

+						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCLCompilerTool"

@@ -4078,6 +4019,7 @@
 					</FileConfiguration>

 					<FileConfiguration

 						Name="Release Server|Win32"

+						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCLCompilerTool"

@@ -4101,10 +4043,11 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\net_common.h"

+					RelativePath="..\src\net_client.h"

 					>

 					<FileConfiguration

 						Name="Debug Server|Win32"

+						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCustomBuildTool"

@@ -4112,6 +4055,7 @@
 					</FileConfiguration>

 					<FileConfiguration

 						Name="Release Server|Win32"

+						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCustomBuildTool"

@@ -4135,22 +4079,62 @@
 					</FileConfiguration>

 				</File>

 				<File

-					RelativePath="..\src\net_dedicated.c"

+					RelativePath="..\src\net_common.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

+						Name="Debug Setup|Win32"

+						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCLCompilerTool"

 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Release Server|Win32"

+						Name="Release Setup|Win32"

+						ExcludedFromBuild="true"

 						>

 						<Tool

 							Name="VCCLCompilerTool"

 						/>

 					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\src\net_common.h"

+					>

+					<FileConfiguration

+						Name="Debug Server|Win32"

+						>

+						<Tool

+							Name="VCCustomBuildTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release Server|Win32"

+						>

+						<Tool

+							Name="VCCustomBuildTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug Setup|Win32"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCustomBuildTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release Setup|Win32"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCustomBuildTool"

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\src\net_dedicated.c"

+					>

 					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

@@ -4314,20 +4298,6 @@
 					RelativePath="..\src\net_io.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -4454,20 +4424,6 @@
 					RelativePath="..\src\net_packet.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -4594,20 +4550,6 @@
 					RelativePath="..\src\net_sdl.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -4662,20 +4604,6 @@
 					RelativePath="..\src\net_server.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -4730,20 +4658,6 @@
 					RelativePath="..\src\net_structrw.c"

 					>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -7078,20 +6992,6 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Debug Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release Server|Win32"

-						>

-						<Tool

-							Name="VCCLCompilerTool"

-						/>

-					</FileConfiguration>

-					<FileConfiguration

 						Name="Debug Setup|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -7440,20 +7340,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_button.h"

@@ -7508,20 +7394,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_checkbox.h"

@@ -7576,20 +7448,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_desktop.h"

@@ -7644,20 +7502,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_dropdown.h"

@@ -7746,20 +7590,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_gui.h"

@@ -7814,20 +7644,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_inputbox.h"

@@ -7882,20 +7698,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_io.h"

@@ -7950,20 +7752,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_label.h"

@@ -8052,20 +7840,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_radiobutton.h"

@@ -8120,20 +7894,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_sdl.h"

@@ -8188,20 +7948,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_separator.h"

@@ -8256,20 +8002,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_spinctrl.h"

@@ -8324,20 +8056,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_strut.h"

@@ -8392,20 +8110,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_table.h"

@@ -8460,20 +8164,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_widget.h"

@@ -8528,20 +8218,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_window.h"

@@ -8596,20 +8272,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\textscreen\txt_window_action.h"

@@ -8650,56 +8312,6 @@
 			Name="Setup"

 			>

 			<File

-				RelativePath="..\setup\setup_icon.c"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Server|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Server|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\setup\compatibility.c"

 				>

 				<FileConfiguration

@@ -8734,20 +8346,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\compatibility.h"

@@ -8834,20 +8432,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\configfile.h"

@@ -8934,20 +8518,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\display.h"

@@ -9034,20 +8604,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\execute.h"

@@ -9134,20 +8690,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\joystick.h"

@@ -9234,20 +8776,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\keyboard.h"

@@ -9334,20 +8862,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\m_argv.h"

@@ -9434,20 +8948,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\mouse.c"

@@ -9484,20 +8984,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\mouse.h"

@@ -9584,20 +9070,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\multiplayer.h"

@@ -9650,7 +9122,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\setup\sound.c"

+				RelativePath="..\setup\setup_icon.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -9684,15 +9156,37 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\setup\sound.c"

+				>

 				<FileConfiguration

-					Name="Debug Setup|Win32"

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Setup|Win32"

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Server|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Server|Win32"

+					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -9784,20 +9278,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\txt_joybinput.h"

@@ -9884,20 +9364,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\txt_keyinput.h"

@@ -9984,20 +9450,6 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Setup|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\setup\txt_mouseinput.h"