--- a/projects/langs.vcproj	Wed Feb 28 22:18:17 2007 +0000
+++ b/projects/langs.vcproj	Thu Mar 01 13:26:30 2007 +0000
@@ -45,7 +45,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating american language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\american.lng"/>
 			</FileConfiguration>
@@ -57,7 +58,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\brazilian_portuguese.lng"/>
 			</FileConfiguration>
@@ -69,7 +71,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\bulgarian.lng"/>
 			</FileConfiguration>
@@ -81,7 +84,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\catalan.lng"/>
 			</FileConfiguration>
@@ -93,7 +97,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\czech.lng"/>
 			</FileConfiguration>
@@ -105,7 +110,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\danish.lng"/>
 			</FileConfiguration>
@@ -117,7 +123,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\dutch.lng"/>
 			</FileConfiguration>
@@ -129,7 +136,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\english.lng"/>
 			</FileConfiguration>
@@ -141,7 +149,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\esperanto.lng"/>
 			</FileConfiguration>
@@ -153,7 +162,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\estonian.lng"/>
 			</FileConfiguration>
@@ -165,7 +175,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\finnish.lng"/>
 			</FileConfiguration>
@@ -177,7 +188,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\french.lng"/>
 			</FileConfiguration>
@@ -189,7 +201,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\galician.lng"/>
 			</FileConfiguration>
@@ -201,7 +214,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\german.lng"/>
 			</FileConfiguration>
@@ -213,7 +227,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\hungarian.lng"/>
 			</FileConfiguration>
@@ -225,7 +240,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\icelandic.lng"/>
 			</FileConfiguration>
@@ -237,7 +253,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\italian.lng"/>
 			</FileConfiguration>
@@ -249,7 +266,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\japanese.lng"/>
 			</FileConfiguration>
@@ -261,7 +279,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\korean.lng"/>
 			</FileConfiguration>
@@ -273,7 +292,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\lithuanian.lng"/>
 			</FileConfiguration>
@@ -285,7 +305,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_bokmal.lng"/>
 			</FileConfiguration>
@@ -297,7 +318,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_nynorsk.lng"/>
 			</FileConfiguration>
@@ -309,7 +331,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating origveh language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\origveh.lng"/>
 			</FileConfiguration>
@@ -321,7 +344,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\polish.lng"/>
 			</FileConfiguration>
@@ -333,7 +357,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\portuguese.lng"/>
 			</FileConfiguration>
@@ -345,7 +370,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\romanian.lng"/>
 			</FileConfiguration>
@@ -357,7 +383,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\russian.lng"/>
 			</FileConfiguration>
@@ -369,7 +396,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\simplified_chinese.lng"/>
 			</FileConfiguration>
@@ -381,7 +409,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovak.lng"/>
 			</FileConfiguration>
@@ -393,7 +422,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovenian.lng"/>
 			</FileConfiguration>
@@ -405,7 +435,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\spanish.lng"/>
 			</FileConfiguration>
@@ -417,7 +448,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\swedish.lng"/>
 			</FileConfiguration>
@@ -429,7 +461,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\traditional_chinese.lng"/>
 			</FileConfiguration>
@@ -441,7 +474,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\turkish.lng"/>
 			</FileConfiguration>
@@ -453,7 +487,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;n"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\ukrainian.lng"/>
 			</FileConfiguration>

--- a/projects/langs_vs80.vcproj	Wed Feb 28 22:18:17 2007 +0000
+++ b/projects/langs_vs80.vcproj	Thu Mar 01 13:26:30 2007 +0000
@@ -47,423 +47,528 @@
 	<Files>
 
 		<File
-			RelativePath="..\src\lang\american.txt"n			>
+			RelativePath="..\src\lang\american.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating american language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\american.lng"n				/>
+					Outputs="..\bin\lang\american.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\brazilian_portuguese.txt"n			>
+			RelativePath="..\src\lang\brazilian_portuguese.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\brazilian_portuguese.lng"n				/>
+					Outputs="..\bin\lang\brazilian_portuguese.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\bulgarian.txt"n			>
+			RelativePath="..\src\lang\bulgarian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\bulgarian.lng"n				/>
+					Outputs="..\bin\lang\bulgarian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\catalan.txt"n			>
+			RelativePath="..\src\lang\catalan.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\catalan.lng"n				/>
+					Outputs="..\bin\lang\catalan.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\czech.txt"n			>
+			RelativePath="..\src\lang\czech.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\czech.lng"n				/>
+					Outputs="..\bin\lang\czech.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\danish.txt"n			>
+			RelativePath="..\src\lang\danish.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\danish.lng"n				/>
+					Outputs="..\bin\lang\danish.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\dutch.txt"n			>
+			RelativePath="..\src\lang\dutch.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\dutch.lng"n				/>
+					Outputs="..\bin\lang\dutch.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\english.txt"n			>
+			RelativePath="..\src\lang\english.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\english.lng"n				/>
+					Outputs="..\bin\lang\english.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\esperanto.txt"n			>
+			RelativePath="..\src\lang\esperanto.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\esperanto.lng"n				/>
+					Outputs="..\bin\lang\esperanto.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\estonian.txt"n			>
+			RelativePath="..\src\lang\estonian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\estonian.lng"n				/>
+					Outputs="..\bin\lang\estonian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\finnish.txt"n			>
+			RelativePath="..\src\lang\finnish.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\finnish.lng"n				/>
+					Outputs="..\bin\lang\finnish.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\french.txt"n			>
+			RelativePath="..\src\lang\french.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\french.lng"n				/>
+					Outputs="..\bin\lang\french.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\galician.txt"n			>
+			RelativePath="..\src\lang\galician.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\galician.lng"n				/>
+					Outputs="..\bin\lang\galician.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\german.txt"n			>
+			RelativePath="..\src\lang\german.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\german.lng"n				/>
+					Outputs="..\bin\lang\german.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\hungarian.txt"n			>
+			RelativePath="..\src\lang\hungarian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\hungarian.lng"n				/>
+					Outputs="..\bin\lang\hungarian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\icelandic.txt"n			>
+			RelativePath="..\src\lang\icelandic.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\icelandic.lng"n				/>
+					Outputs="..\bin\lang\icelandic.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\italian.txt"n			>
+			RelativePath="..\src\lang\italian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\italian.lng"n				/>
+					Outputs="..\bin\lang\italian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\japanese.txt"n			>
+			RelativePath="..\src\lang\japanese.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\japanese.lng"n				/>
+					Outputs="..\bin\lang\japanese.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\korean.txt"n			>
+			RelativePath="..\src\lang\korean.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\korean.lng"n				/>
+					Outputs="..\bin\lang\korean.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\lithuanian.txt"n			>
+			RelativePath="..\src\lang\lithuanian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\lithuanian.lng"n				/>
+					Outputs="..\bin\lang\lithuanian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\norwegian_bokmal.txt"n			>
+			RelativePath="..\src\lang\norwegian_bokmal.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\norwegian_bokmal.lng"n				/>
+					Outputs="..\bin\lang\norwegian_bokmal.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\norwegian_nynorsk.txt"n			>
+			RelativePath="..\src\lang\norwegian_nynorsk.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\norwegian_nynorsk.lng"n				/>
+					Outputs="..\bin\lang\norwegian_nynorsk.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\origveh.txt"n			>
+			RelativePath="..\src\lang\origveh.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating origveh language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\origveh.lng"n				/>
+					Outputs="..\bin\lang\origveh.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\polish.txt"n			>
+			RelativePath="..\src\lang\polish.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\polish.lng"n				/>
+					Outputs="..\bin\lang\polish.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\portuguese.txt"n			>
+			RelativePath="..\src\lang\portuguese.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\portuguese.lng"n				/>
+					Outputs="..\bin\lang\portuguese.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\romanian.txt"n			>
+			RelativePath="..\src\lang\romanian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\romanian.lng"n				/>
+					Outputs="..\bin\lang\romanian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\russian.txt"n			>
+			RelativePath="..\src\lang\russian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\russian.lng"n				/>
+					Outputs="..\bin\lang\russian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\simplified_chinese.txt"n			>
+			RelativePath="..\src\lang\simplified_chinese.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\simplified_chinese.lng"n				/>
+					Outputs="..\bin\lang\simplified_chinese.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\slovak.txt"n			>
+			RelativePath="..\src\lang\slovak.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\slovak.lng"n				/>
+					Outputs="..\bin\lang\slovak.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\slovenian.txt"n			>
+			RelativePath="..\src\lang\slovenian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\slovenian.lng"n				/>
+					Outputs="..\bin\lang\slovenian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\spanish.txt"n			>
+			RelativePath="..\src\lang\spanish.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\spanish.lng"n				/>
+					Outputs="..\bin\lang\spanish.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\swedish.txt"n			>
+			RelativePath="..\src\lang\swedish.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\swedish.lng"n				/>
+					Outputs="..\bin\lang\swedish.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\traditional_chinese.txt"n			>
+			RelativePath="..\src\lang\traditional_chinese.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\traditional_chinese.lng"n				/>
+					Outputs="..\bin\lang\traditional_chinese.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\turkish.txt"n			>
+			RelativePath="..\src\lang\turkish.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\turkish.lng"n				/>
+					Outputs="..\bin\lang\turkish.lng"
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\ukrainian.txt"n			>
+			RelativePath="..\src\lang\ukrainian.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"n				>
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\ukrainian.lng"n				/>
+					Outputs="..\bin\lang\ukrainian.lng"
+				/>
 			</FileConfiguration>
 		</File>
 	</Files>

--- a/projects/openttd_vs80.vcproj	Wed Feb 28 22:18:17 2007 +0000
+++ b/projects/openttd_vs80.vcproj	Thu Mar 01 13:26:30 2007 +0000
@@ -444,1074 +444,1412 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath=".\..\src\airport.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\aystar.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\bmp.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\callback_table.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargotype.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\command.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\console.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\console_cmds.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\currency.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\date.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\debug.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\dedicated.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\depot.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\driver.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\economy.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\elrail.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\engine.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\fileio.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\fios.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\fontcache.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\genworld.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\gfx.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\gfxinit.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\heightmap.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\helpers.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\landscape.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\map.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\md5.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\mersenne.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\minilzo.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\misc.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\mixer.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\music.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\namegen.cpp"n				>
+				RelativePath=".\..\src\airport.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_client.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_data.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_gamelist.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_server.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_udp.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\npf.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\oldloader.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\oldpool.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\openttd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\os_timer.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\ottdres.rc"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfind.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\players.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\queue.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\rail.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload.cpp"n				>
+				RelativePath=".\..\src\aystar.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\screenshot.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\sdl.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\settings.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\signs.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\sound.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\spritecache.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\station.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\string.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\strings.cpp"n				>
+				RelativePath=".\..\src\bmp.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\texteff.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\tgp.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\thread.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\tile.cpp"n				>
+				RelativePath=".\..\src\callback_table.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\vehicle.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\viewport.cpp"n				>
+				RelativePath=".\..\src\cargotype.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\waypoint.cpp"n				>
+				RelativePath=".\..\src\command.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\widget.cpp"n				>
+				RelativePath=".\..\src\console.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\win32.cpp"n				>
+				RelativePath=".\..\src\console_cmds.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\window.cpp"n				>
+				RelativePath=".\..\src\currency.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\date.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\debug.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\dedicated.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\depot.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\driver.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\economy.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\elrail.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\fileio.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\fios.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\fontcache.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\genworld.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\gfx.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\gfxinit.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\heightmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\helpers.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\landscape.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\map.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\md5.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\mersenne.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\minilzo.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\misc.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\mixer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\music.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\namegen.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_client.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_data.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gamelist.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_server.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_udp.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\npf.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\oldloader.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\openttd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\os_timer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ottdres.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfind.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\players.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\queue.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\rail.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\saveload.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\screenshot.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sdl.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\settings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\signs.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\spritecache.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\station.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\string.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\strings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\texteff.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tgp.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\thread.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tile.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\viewport.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\waypoint.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\win32.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			>
 			<File
-				RelativePath=".\..\src\aircraft.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\airport.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\airport_movement.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\aystar.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\bmp.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargotype.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\command.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\console.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\currency.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\date.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\debug.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\video\dedicated_v.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\depot.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\music\dmusic.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\driver.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\economy.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\engine.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\fileio.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\fios.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\fontcache.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\functions.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\genworld.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\gfx.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\gfxinit.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\gui.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\hal.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\heightmap.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\helpers.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\industry.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\livery.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\macros.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\map.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\md5.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\mixer.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\music.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_client.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_data.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_gamelist.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_gui.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_server.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_udp.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_callbacks.h"n				>
+				RelativePath=".\..\src\aircraft.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_cargo.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_config.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_engine.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_sound.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_spritegroup.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_station.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_text.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\news.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\npf.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\music\null_m.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\sound\null_s.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\video\null_v.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\oldpool.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\openttd.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfind.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\player.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\queue.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\rail.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\road_cmd.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\saveload.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\screenshot.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\sound\sdl_s.h"n				>
+				RelativePath=".\..\src\airport.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\sdl_v.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\settings.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\signs.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\slope.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\sound.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\sprite.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\station.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\stdafx.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\string.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\tgp.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\thread.h"n				>
+				RelativePath=".\..\src\airport_movement.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tile.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\town.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\train.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\variables.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\vehicle.h"n				>
+				RelativePath=".\..\src\aystar.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\vehicle_gui.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\viewport.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\waypoint.h"n				>
+				RelativePath=".\..\src\bmp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\win32_m.h"n				>
+				RelativePath=".\..\src\cargotype.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound\win32_s.h"n				>
+				RelativePath=".\..\src\command.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\win32_v.h"n				>
+				RelativePath=".\..\src\console.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\window.h"n				>
+				RelativePath=".\..\src\currency.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\date.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\debug.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\video\dedicated_v.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\depot.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\music\dmusic.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\driver.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\economy.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\engine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\fileio.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\fios.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\fontcache.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\functions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\genworld.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\gfx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\gfxinit.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\hal.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\heightmap.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\helpers.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\industry.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\livery.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\macros.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\md5.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\mixer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\music.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_client.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_data.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gamelist.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_server.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_udp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_callbacks.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_cargo.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_config.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_engine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_sound.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_spritegroup.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_station.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_text.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\news.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\npf.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\music\null_m.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound\null_s.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\video\null_v.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\openttd.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfind.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\player.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\queue.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\rail.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_cmd.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\saveload.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\screenshot.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound\sdl_s.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\video\sdl_v.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\settings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\signs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\slope.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sprite.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\station.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\stdafx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\string.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tgp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\thread.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tile.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\town.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\train.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\variables.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\viewport.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\waypoint.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\music\win32_m.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound\win32_s.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\video\win32_v.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="GUI Source Code"
 			>
 			<File
-				RelativePath=".\..\src\aircraft_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\airport_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\autoreplace_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\bridge_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\build_vehicle_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\depot_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\dock_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\engine_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\genworld_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\graph_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\industry_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\intro_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\main_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\misc_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\music_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\network_gui.cpp"n				>
+				RelativePath=".\..\src\aircraft_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\news_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\order_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\rail_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\road_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\roadveh_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\settings_gui.cpp"n				>
+				RelativePath=".\..\src\airport_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ship_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\signs_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\smallmap_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\station_gui.cpp"n				>
+				RelativePath=".\..\src\autoreplace_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\subsidy_gui.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\terraform_gui.cpp"n				>
+				RelativePath=".\..\src\bridge_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\town_gui.cpp"n				>
+				RelativePath=".\..\src\build_vehicle_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\train_gui.cpp"n				>
+				RelativePath=".\..\src\depot_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\vehicle_gui.cpp"n				>
+				RelativePath=".\..\src\dock_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\engine_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\genworld_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\graph_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\industry_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\intro_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\main_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\misc_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\music_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\news_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\order_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\player_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\rail_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\roadveh_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\settings_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ship_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\signs_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\smallmap_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\station_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\subsidy_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\terraform_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\town_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\train_gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle_gui.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Landscape"
 			>
 			<File
-				RelativePath=".\..\src\aircraft_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\clear_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\disaster_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\dummy_land.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\industry_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\misc_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\order_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\rail_cmd.cpp"n				>
+				RelativePath=".\..\src\aircraft_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\road_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\roadveh_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\ship_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\station_cmd.cpp"n				>
+				RelativePath=".\..\src\clear_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\town_cmd.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\train_cmd.cpp"n				>
+				RelativePath=".\..\src\disaster_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tree_cmd.cpp"n				>
+				RelativePath=".\..\src\dummy_land.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tunnelbridge_cmd.cpp"n				>
+				RelativePath=".\..\src\industry_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\unmovable_cmd.cpp"n				>
+				RelativePath=".\..\src\misc_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\water_cmd.cpp"n				>
+				RelativePath=".\..\src\order_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\rail_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\roadveh_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ship_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\station_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\town_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\train_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tree_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tunnelbridge_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\unmovable_cmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\water_cmd.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Tables"
 			>
 			<File
-				RelativePath=".\..\src\table\ai_rail.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\allstrings.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\animcursors.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\autorail.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\build_industry.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\cargo_const.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\clear_land.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\elrail_data.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\engines.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\genland.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\industry_land.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\landscape_sprite.h"n				>
+				RelativePath=".\..\src\table\ai_rail.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\namegen.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\palettes.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\road_land.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\roadveh.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\sprites.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\station_land.h"n				>
+				RelativePath=".\..\src\table\allstrings.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\strings.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\town_land.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\track_land.h"n				>
+				RelativePath=".\..\src\table\animcursors.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\train_cmd.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\tree_land.h"n				>
+				RelativePath=".\..\src\table\autorail.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\tunnel_land.h"n				>
+				RelativePath=".\..\src\table\build_industry.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\unmovable_land.h"n				>
+				RelativePath=".\..\src\table\cargo_const.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\water_land.h"n				>
+				RelativePath=".\..\src\table\clear_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\elrail_data.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\engines.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\genland.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\industry_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\landscape_sprite.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\namegen.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\palettes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\road_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\roadveh.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\sprites.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\station_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\strings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\town_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\track_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\train_cmd.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\tree_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\tunnel_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\unmovable_land.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\table\water_land.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="AI Files"
 			>
 			<File
-				RelativePath=".\..\src\ai\ai.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\trolly\build.cpp"n				>
+				RelativePath=".\..\src\ai\ai.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\default\default.cpp"n				>
+				RelativePath=".\..\src\ai\trolly\build.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\trolly\pathfinder.cpp"n				>
+				RelativePath=".\..\src\ai\default\default.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\trolly\shared.cpp"n				>
+				RelativePath=".\..\src\ai\trolly\pathfinder.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\trolly\trolly.cpp"n				>
+				RelativePath=".\..\src\ai\trolly\shared.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\trolly.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="NewGRF"
 			>
 			<File
-				RelativePath=".\..\src\newgrf.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_config.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\newgrf_engine.cpp"n				>
+				RelativePath=".\..\src\newgrf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_sound.cpp"n				>
+				RelativePath=".\..\src\newgrf_config.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_spritegroup.cpp"n				>
+				RelativePath=".\..\src\newgrf_engine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_station.cpp"n				>
+				RelativePath=".\..\src\newgrf_sound.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_text.cpp"n				>
+				RelativePath=".\..\src\newgrf_spritegroup.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_station.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_text.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Map Accessors"
 			>
 			<File
-				RelativePath=".\..\src\bridge_map.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\bridge_map.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\clear_map.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\industry_map.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\rail_map.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\road_map.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\road_map.h"n				>
+				RelativePath=".\..\src\bridge_map.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\station_map.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\station_map.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\town_map.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\tree_map.h"n				>
+				RelativePath=".\..\src\bridge_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tunnel_map.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\tunnel_map.h"n				>
+				RelativePath=".\..\src\clear_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\unmovable_map.h"n				>
+				RelativePath=".\..\src\industry_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\void_map.h"n				>
+				RelativePath=".\..\src\rail_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\water_map.h"n				>
+				RelativePath=".\..\src\road_map.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\station_map.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\station_map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\town_map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tree_map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tunnel_map.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tunnel_map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\unmovable_map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\void_map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\water_map.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Misc"
 			>
 			<File
-				RelativePath=".\..\src\misc\array.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\misc\autocopyptr.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\misc\autoptr.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\misc\binaryheap.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\misc\blob.hpp"n				>
+				RelativePath=".\..\src\misc\array.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\countedobj.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\misc\countedptr.hpp"n				>
+				RelativePath=".\..\src\misc\autocopyptr.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\crc32.hpp"n				>
+				RelativePath=".\..\src\misc\autoptr.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\fixedsizearray.hpp"n				>
+				RelativePath=".\..\src\misc\binaryheap.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\hashtable.hpp"n				>
+				RelativePath=".\..\src\misc\blob.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\rect.hpp"n				>
+				RelativePath=".\..\src\misc\countedobj.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\misc\countedptr.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\misc\crc32.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\misc\fixedsizearray.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\misc\hashtable.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\misc\rect.hpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Widget"
 			>
 			<File
-				RelativePath=".\..\src\widget\widget.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_base.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_button.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_button_img2.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_button_img.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_button_txt2.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_button_txt.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_caption.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_closebox.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_composite.cpp"n				>
+				RelativePath=".\..\src\widget\widget.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\widget\widget_frame.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_hscrollbar.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_inset.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_label.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_list.cpp"n				>
+				RelativePath=".\..\src\widget\widget_base.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\widget\widget_panel.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\widget\widget_resizebox.cpp"n				>
+				RelativePath=".\..\src\widget\widget_button.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\widget\widget_scrollbar.cpp"n				>
+				RelativePath=".\..\src\widget\widget_button_img2.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\widget\widget_stickybox.cpp"n				>
+				RelativePath=".\..\src\widget\widget_button_img.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\widget\window_event_base.h"n				>
+				RelativePath=".\..\src\widget\widget_button_txt2.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\widget\window_events.hpp"n				>
+				RelativePath=".\..\src\widget\widget_button_txt.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_caption.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_closebox.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_composite.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_frame.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_hscrollbar.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_inset.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_label.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_list.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_panel.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_resizebox.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_scrollbar.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\widget_stickybox.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\window_event_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widget\window_events.hpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Network Core"
 			>
 			<File
-				RelativePath=".\..\src\network\core\config.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\core.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\core.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\game.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\os_abstraction.h"n				>
+				RelativePath=".\..\src\network\core\config.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\packet.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\packet.h"n				>
+				RelativePath=".\..\src\network\core\core.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\tcp.cpp"n				>
+				RelativePath=".\..\src\network\core\core.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\tcp.h"n				>
+				RelativePath=".\..\src\network\core\game.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\udp.cpp"n				>
+				RelativePath=".\..\src\network\core\os_abstraction.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\udp.h"n				>
+				RelativePath=".\..\src\network\core\packet.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="YAPF"
 			>
 			<File
-				RelativePath=".\..\src\yapf\follow_track.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\follow_track.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\nodelist.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\track_dir.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf.h"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_base.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_common.cpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_common.hpp"n				>
+				RelativePath=".\..\src\yapf\follow_track.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_costbase.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_costcache.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_costrail.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_destrail.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_node.hpp"n				>
+				RelativePath=".\..\src\yapf\follow_track.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_node_rail.hpp"n				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_node_road.hpp"n				>
+				RelativePath=".\..\src\yapf\nodelist.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_rail.cpp"n				>
+				RelativePath=".\..\src\yapf\track_dir.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_road.cpp"n				>
+				RelativePath=".\..\src\yapf\yapf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_settings.h"n				>
+				RelativePath=".\..\src\yapf\yapf.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_ship.cpp"n				>
+				RelativePath=".\..\src\yapf\yapf_base.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_common.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_common.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costbase.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costcache.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costrail.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_destrail.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node_rail.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node_road.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_rail.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_road.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_settings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_ship.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Video"
 			>
 			<File
-				RelativePath=".\..\src\video\dedicated_v.cpp"n				>
+				RelativePath=".\..\src\video\dedicated_v.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\null_v.cpp"n				>
+				RelativePath=".\..\src\video\null_v.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\sdl_v.cpp"n				>
+				RelativePath=".\..\src\video\sdl_v.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\win32_v.cpp"n				>
+				RelativePath=".\..\src\video\win32_v.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Music"
 			>
 			<File
-				RelativePath=".\..\src\music\dmusic.cpp"n				>
+				RelativePath=".\..\src\music\dmusic.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\null_m.cpp"n				>
+				RelativePath=".\..\src\music\null_m.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\win32_m.cpp"n				>
+				RelativePath=".\..\src\music\win32_m.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Sound"
 			>
 			<File
-				RelativePath=".\..\src\sound\null_s.cpp"n				>
+				RelativePath=".\..\src\sound\null_s.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound\sdl_s.cpp"n				>
+				RelativePath=".\..\src\sound\sdl_s.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound\win32_s.cpp"n				>
+				RelativePath=".\..\src\sound\win32_s.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter