X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2FinspircdVC80.vcproj;h=2f17413d3ef1782eb809cad9180504c735aed4e7;hb=1bf397ca49f5433915a9a15776d8debedd6ff936;hp=28916017feb919a22c185439e04f8909ee0a2c9c;hpb=1726096dd0255aeb6e63029d07691735581815fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index 28916017f..2f17413d3 100644
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -50,11 +50,12 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100; 4512; 4127"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -101,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"
+				CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src\commands&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd ..\modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -131,15 +132,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				AdditionalOptions="/MP"
+				Optimization="1"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				RuntimeLibrary="0"
+				MinimalRebuild="false"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -155,10 +158,12 @@
 				AdditionalDependencies="dbghelp.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
 				OutputFile="$(OutDir)/inspircd.exe"
 				LinkIncremental="1"
+				EmbedManagedResourceFile="inspircd.ico"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -184,7 +189,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"
+				CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src\commands&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd ..\modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -366,10 +371,18 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\src\bancache.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\base.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\channelmanager.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\channels.cpp"
 				>
@@ -422,6 +435,10 @@
 				RelativePath="..\src\inspstring.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\logger.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\mode.cpp"
 				>
@@ -447,13 +464,45 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\socketengine_iocp.cpp"
+				RelativePath="..\src\socketengines\socketengine_iocp.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\socketengines\socketengine_select.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\testsuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\threadengine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\threadengines\threadengine_win32.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\timer.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\user_resolver.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\usermanager.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\userprocess.cpp"
 				>
@@ -504,10 +553,22 @@
 		<Filter
 			Name="Header Files"
 			>
+			<File
+				RelativePath="..\include\bancache.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\base.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\caller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\channelmanager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\channels.h"
 				>
@@ -576,6 +637,10 @@
 				RelativePath="..\include\inspstring.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\logger.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\mode.h"
 				>
@@ -597,7 +662,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\socketengine_iocp.h"
+				RelativePath="..\include\socketengines\socketengine_iocp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\socketengines\socketengine_select.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\testsuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\threadengine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\threadengines\threadengine_win32.h"
 				>
 			</File>
 			<File
@@ -612,6 +693,14 @@
 				RelativePath="..\include\u_listmode.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\uid.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\usermanager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\users.h"
 				>
@@ -960,6 +1049,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_callerid.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_cban.cpp"
 				>
@@ -1660,26 +1769,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\modules\m_http_client.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\modules\m_httpd.cpp"
 				>
@@ -2320,6 +2409,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_remoteinclude_http.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_remove.cpp"
 				>
@@ -2800,26 +2909,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\modules\m_silence_ext.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\modules\m_spy.cpp"
 				>
@@ -3204,7 +3293,67 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\src\modules\extra\m_httpclienttest.cpp"
+					RelativePath="..\src\modules\extra\m_geoip.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\modules\extra\m_ldapauth.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\modules\extra\m_ldapoper.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\modules\extra\m_mssql.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -3263,6 +3412,26 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="..\src\modules\extra\m_rline.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath="..\src\modules\extra\m_sqlauth.cpp"
 					>
@@ -3529,7 +3698,7 @@
 			Name="Command Handlers"
 			>
 			<File
-				RelativePath="..\src\cmd_admin.cpp"
+				RelativePath="..\src\commands\cmd_admin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3549,7 +3718,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_away.cpp"
+				RelativePath="..\src\commands\cmd_away.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3569,7 +3738,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_clearcache.cpp"
+				RelativePath="..\src\commands\cmd_clearcache.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3589,7 +3758,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_commands.cpp"
+				RelativePath="..\src\commands\cmd_commands.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3609,7 +3778,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_connect.cpp"
+				RelativePath="..\src\commands\cmd_connect.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3629,7 +3798,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_die.cpp"
+				RelativePath="..\src\commands\cmd_die.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3649,7 +3818,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_eline.cpp"
+				RelativePath="..\src\commands\cmd_eline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3669,7 +3838,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_gline.cpp"
+				RelativePath="..\src\commands\cmd_gline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3689,7 +3858,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_info.cpp"
+				RelativePath="..\src\commands\cmd_info.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3709,7 +3878,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_invite.cpp"
+				RelativePath="..\src\commands\cmd_invite.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3729,7 +3898,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_ison.cpp"
+				RelativePath="..\src\commands\cmd_ison.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3749,7 +3918,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_join.cpp"
+				RelativePath="..\src\commands\cmd_join.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3769,7 +3938,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_kick.cpp"
+				RelativePath="..\src\commands\cmd_kick.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3789,7 +3958,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_kill.cpp"
+				RelativePath="..\src\commands\cmd_kill.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3809,7 +3978,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_kline.cpp"
+				RelativePath="..\src\commands\cmd_kline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3829,7 +3998,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_links.cpp"
+				RelativePath="..\src\commands\cmd_links.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3849,7 +4018,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_list.cpp"
+				RelativePath="..\src\commands\cmd_list.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3869,7 +4038,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_loadmodule.cpp"
+				RelativePath="..\src\commands\cmd_loadmodule.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3889,7 +4058,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_lusers.cpp"
+				RelativePath="..\src\commands\cmd_lusers.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3909,7 +4078,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_map.cpp"
+				RelativePath="..\src\commands\cmd_map.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3929,7 +4098,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_mode.cpp"
+				RelativePath="..\src\commands\cmd_mode.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3949,7 +4118,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_modules.cpp"
+				RelativePath="..\src\commands\cmd_modules.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3969,7 +4138,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_motd.cpp"
+				RelativePath="..\src\commands\cmd_motd.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3989,7 +4158,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_names.cpp"
+				RelativePath="..\src\commands\cmd_names.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4009,7 +4178,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_nick.cpp"
+				RelativePath="..\src\commands\cmd_nick.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4029,7 +4198,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_notice.cpp"
+				RelativePath="..\src\commands\cmd_notice.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4049,7 +4218,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_oper.cpp"
+				RelativePath="..\src\commands\cmd_oper.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4069,7 +4238,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_part.cpp"
+				RelativePath="..\src\commands\cmd_part.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4089,7 +4258,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_pass.cpp"
+				RelativePath="..\src\commands\cmd_pass.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4109,7 +4278,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_ping.cpp"
+				RelativePath="..\src\commands\cmd_ping.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4129,7 +4298,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_pong.cpp"
+				RelativePath="..\src\commands\cmd_pong.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4149,7 +4318,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_privmsg.cpp"
+				RelativePath="..\src\commands\cmd_privmsg.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4169,7 +4338,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_qline.cpp"
+				RelativePath="..\src\commands\cmd_qline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4189,7 +4358,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_quit.cpp"
+				RelativePath="..\src\commands\cmd_quit.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4209,7 +4378,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_rehash.cpp"
+				RelativePath="..\src\commands\cmd_rehash.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4229,7 +4398,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_reloadmodule.cpp"
+				RelativePath="..\src\commands\cmd_reloadmodule.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4249,7 +4418,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_restart.cpp"
+				RelativePath="..\src\commands\cmd_restart.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4269,7 +4438,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_rules.cpp"
+				RelativePath="..\src\commands\cmd_rules.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4289,7 +4458,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_server.cpp"
+				RelativePath="..\src\commands\cmd_server.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4309,7 +4478,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_squit.cpp"
+				RelativePath="..\src\commands\cmd_squit.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4329,7 +4498,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_stats.cpp"
+				RelativePath="..\src\commands\cmd_stats.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4349,7 +4518,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_summon.cpp"
+				RelativePath="..\src\commands\cmd_time.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4369,7 +4538,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_time.cpp"
+				RelativePath="..\src\commands\cmd_topic.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4389,7 +4558,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_topic.cpp"
+				RelativePath="..\src\commands\cmd_trace.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4409,7 +4578,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_trace.cpp"
+				RelativePath="..\src\commands\cmd_unloadmodule.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4429,7 +4598,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_unloadmodule.cpp"
+				RelativePath="..\src\commands\cmd_user.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4449,7 +4618,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_user.cpp"
+				RelativePath="..\src\commands\cmd_userhost.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4469,7 +4638,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_userhost.cpp"
+				RelativePath="..\src\commands\cmd_version.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4489,7 +4658,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_users.cpp"
+				RelativePath="..\src\commands\cmd_wallops.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4509,7 +4678,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_version.cpp"
+				RelativePath="..\src\commands\cmd_who.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4529,7 +4698,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_wallops.cpp"
+				RelativePath="..\src\commands\cmd_whois.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4549,7 +4718,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_who.cpp"
+				RelativePath="..\src\commands\cmd_whowas.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4569,7 +4738,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_whois.cpp"
+				RelativePath="..\src\commands\cmd_zline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4588,45 +4757,17 @@
 					/>
 				</FileConfiguration>
 			</File>
+		</Filter>
+		<Filter
+			Name="Resources"
+			>
 			<File
-				RelativePath="..\src\cmd_whowas.cpp"
+				RelativePath=".\inspircd.ico"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_zline.cpp"
+				RelativePath=".\resource.rc"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>