X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2FinspircdVC80.vcproj;h=aee4dcbde9eb656bc299e1bb41d91d4ec08d1d12;hb=a6cf47a2cd96c459bfc241c6dce8ca8454140484;hp=140b92508038a96f1a070609d1f72398ef057227;hpb=bc804f5eeb9fc0d8b14430c9c6de9621165a22a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index 140b92508..aee4dcbde 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"
@@ -67,7 +68,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
+				AdditionalDependencies="psapi.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"
 				ShowProgress="0"
 				OutputFile="$(OutDir)/inspircd.exe"
 				LinkIncremental="1"
@@ -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"
@@ -152,13 +155,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
+				AdditionalDependencies="psapi.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,14 +371,26 @@
 			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"
 				>
 			</File>
+			<File
+				RelativePath="..\src\cidr.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\command_parse.cpp"
 				>
@@ -414,6 +431,10 @@
 				RelativePath="..\src\inspircd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\inspircd_namedpipe.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\inspsocket.cpp"
 				>
@@ -422,6 +443,10 @@
 				RelativePath="..\src\inspstring.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\logger.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\mode.cpp"
 				>
@@ -447,7 +472,31 @@
 				>
 			</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
@@ -458,6 +507,10 @@
 				RelativePath="..\src\user_resolver.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\usermanager.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\userprocess.cpp"
 				>
@@ -474,6 +527,10 @@
 				RelativePath="..\src\wildcard.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\win32service.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\xline.cpp"
 				>
@@ -508,10 +565,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"
 				>
@@ -572,6 +641,10 @@
 				RelativePath="..\include\inspircd_config.h"
 				>
 			</File>
+			<File
+				RelativePath=".\inspircd_namedpipe.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\inspsocket.h"
 				>
@@ -580,6 +653,10 @@
 				RelativePath="..\include\inspstring.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\logger.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\mode.h"
 				>
@@ -588,6 +665,10 @@
 				RelativePath="..\include\modules.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\numerics.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\snomasks.h"
 				>
@@ -601,7 +682,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
@@ -616,6 +713,14 @@
 				RelativePath="..\include\u_listmode.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\uid.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\usermanager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\users.h"
 				>
@@ -624,6 +729,10 @@
 				RelativePath="..\include\wildcard.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\win32service.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\xline.h"
 				>
@@ -684,10 +793,6 @@
 				RelativePath="..\src\modes\umode_i.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\modes\umode_n.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\modes\umode_o.cpp"
 				>
@@ -704,6 +809,26 @@
 		<Filter
 			Name="Modules"
 			>
+			<File
+				RelativePath="..\src\modules\account.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\modules\httpclient.h"
 				>
@@ -744,6 +869,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_abbreviation.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_alias.cpp"
 				>
@@ -964,6 +1109,66 @@
 					/>
 				</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_cap.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_cap.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_cban.cpp"
 				>
@@ -1064,6 +1269,46 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_chanlog.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_channelban.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_chanprotect.cpp"
 				>
@@ -1105,7 +1350,307 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chghost.cpp"
+				RelativePath="..\src\modules\m_chghost.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_chgident.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_chgname.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_cloaking.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_clones.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_close.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_commonchans.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_conn_join.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_conn_umodes.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_conn_waitpong.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_connectban.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_connflood.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_customtitle.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_cycle.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_dccallow.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_deaf.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1125,7 +1670,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chgident.cpp"
+				RelativePath="..\src\modules\m_delayjoin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1145,7 +1690,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chgname.cpp"
+				RelativePath="..\src\modules\m_denychans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1165,7 +1710,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_cloaking.cpp"
+				RelativePath="..\src\modules\m_devoice.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1185,7 +1730,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_clones.cpp"
+				RelativePath="..\src\modules\m_dnsbl.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1205,7 +1750,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_close.cpp"
+				RelativePath="..\src\modules\m_filter.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1225,14 +1770,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_commonchans.cpp"
+				RelativePath="..\src\modules\m_filter.h"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCLCompilerTool"
+						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1240,12 +1785,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCLCompilerTool"
+						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_conn_join.cpp"
+				RelativePath="..\src\modules\m_foobar.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1265,7 +1810,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_conn_umodes.cpp"
+				RelativePath="..\src\modules\m_gecosban.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1285,7 +1830,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_conn_waitpong.cpp"
+				RelativePath="..\src\modules\m_globalload.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1305,7 +1850,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_connflood.cpp"
+				RelativePath="..\src\modules\m_globops.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1325,14 +1870,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_customtitle.cpp"
+				RelativePath="..\src\modules\m_hash.h"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCLCompilerTool"
+						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1340,12 +1885,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCLCompilerTool"
+						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_cycle.cpp"
+				RelativePath="..\src\modules\m_helpop.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1365,7 +1910,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_dccallow.cpp"
+				RelativePath="..\src\modules\m_hidechans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1385,7 +1930,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_deaf.cpp"
+				RelativePath="..\src\modules\m_hideoper.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1405,7 +1950,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_denychans.cpp"
+				RelativePath="..\src\modules\m_hostchange.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1425,7 +1970,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_devoice.cpp"
+				RelativePath="..\src\modules\m_httpd.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1445,7 +1990,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_dnsbl.cpp"
+				RelativePath="..\src\modules\m_httpd_acl.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1465,7 +2010,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_filter.cpp"
+				RelativePath="..\src\modules\m_httpd_config.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1485,14 +2030,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_filter.h"
+				RelativePath="..\src\modules\m_httpd_stats.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1500,12 +2045,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_foobar.cpp"
+				RelativePath="..\src\modules\m_ident.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1525,7 +2070,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_globalload.cpp"
+				RelativePath="..\src\modules\m_invisible.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1545,7 +2090,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_globops.cpp"
+				RelativePath="..\src\modules\m_inviteexception.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1565,14 +2110,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_hash.h"
+				RelativePath="..\src\modules\m_joinflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1580,12 +2125,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_helpop.cpp"
+				RelativePath="..\src\modules\m_jumpserver.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1605,7 +2150,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_hidechans.cpp"
+				RelativePath="..\src\modules\m_kicknorejoin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1625,7 +2170,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_hideoper.cpp"
+				RelativePath="..\src\modules\m_knock.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1645,7 +2190,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_hostchange.cpp"
+				RelativePath="..\src\modules\m_lockserv.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1665,7 +2210,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_http_client.cpp"
+				RelativePath="..\src\modules\m_maphide.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1685,7 +2230,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_httpd.cpp"
+				RelativePath="..\src\modules\m_md5.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1705,7 +2250,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_httpd_stats.cpp"
+				RelativePath="..\src\modules\m_messageflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1725,7 +2270,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_ident.cpp"
+				RelativePath="..\src\modules\m_muteban.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1745,7 +2290,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_invisible.cpp"
+				RelativePath="..\src\modules\m_namesx.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1765,7 +2310,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_inviteexception.cpp"
+				RelativePath="..\src\modules\m_nickflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1785,7 +2330,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_joinflood.cpp"
+				RelativePath="..\src\modules\m_nicklock.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1805,7 +2350,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_jumpserver.cpp"
+				RelativePath="..\src\modules\m_noctcp.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1825,7 +2370,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_kicknorejoin.cpp"
+				RelativePath="..\src\modules\m_noinvite.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1845,7 +2390,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_knock.cpp"
+				RelativePath="..\src\modules\m_nokicks.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1865,7 +2410,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_lockserv.cpp"
+				RelativePath="..\src\modules\m_nonicks.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1885,7 +2430,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_md5.cpp"
+				RelativePath="..\src\modules\m_nonotice.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1905,7 +2450,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_messageflood.cpp"
+				RelativePath="..\src\modules\m_nopartmsg.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1925,7 +2470,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_namesx.cpp"
+				RelativePath="..\src\modules\m_oper_hash.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1945,7 +2490,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nickflood.cpp"
+				RelativePath="..\src\modules\m_operchans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1965,7 +2510,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nicklock.cpp"
+				RelativePath="..\src\modules\m_operflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1985,7 +2530,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_noctcp.cpp"
+				RelativePath="..\src\modules\m_operjoin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2005,7 +2550,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_noinvite.cpp"
+				RelativePath="..\src\modules\m_operlevels.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2025,7 +2570,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nokicks.cpp"
+				RelativePath="..\src\modules\m_operlog.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2045,7 +2590,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nonicks.cpp"
+				RelativePath="..\src\modules\m_opermodes.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2065,7 +2610,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nonotice.cpp"
+				RelativePath="..\src\modules\m_opermotd.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2085,7 +2630,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_oper_hash.cpp"
+				RelativePath="..\src\modules\m_override.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2105,7 +2650,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operchans.cpp"
+				RelativePath="..\src\modules\m_password_hash.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2125,7 +2670,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operflood.cpp"
+				RelativePath="..\src\modules\m_permchannels.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2145,7 +2690,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operjoin.cpp"
+				RelativePath="..\src\modules\m_proxyscan.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2165,7 +2710,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operlevels.cpp"
+				RelativePath="..\src\modules\m_randquote.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2185,7 +2730,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operlog.cpp"
+				RelativePath="..\src\modules\m_redirect.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2205,7 +2750,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_opermodes.cpp"
+				RelativePath="..\src\modules\m_regonlycreate.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2225,7 +2770,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_opermotd.cpp"
+				RelativePath="..\src\modules\m_remoteinclude_http.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2245,7 +2790,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_override.cpp"
+				RelativePath="..\src\modules\m_remove.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2265,7 +2810,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_randquote.cpp"
+				RelativePath="..\src\modules\m_restrictbanned.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2285,7 +2830,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_redirect.cpp"
+				RelativePath="..\src\modules\m_restrictchans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2305,7 +2850,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_regonlycreate.cpp"
+				RelativePath="..\src\modules\m_restrictmsg.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2325,7 +2870,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_remove.cpp"
+				RelativePath="..\src\modules\m_ripemd160.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2345,7 +2890,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_restrictbanned.cpp"
+				RelativePath="..\src\modules\m_rpc_json.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2365,7 +2910,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_restrictchans.cpp"
+				RelativePath="..\src\modules\m_rpctest.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2385,7 +2930,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_restrictmsg.cpp"
+				RelativePath="..\src\modules\m_safelist.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2405,7 +2950,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_rpc_json.cpp"
+				RelativePath="..\src\modules\m_sajoin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2425,7 +2970,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_rpctest.cpp"
+				RelativePath="..\src\modules\m_samode.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2445,7 +2990,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_safelist.cpp"
+				RelativePath="..\src\modules\m_sanick.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2465,7 +3010,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_sajoin.cpp"
+				RelativePath="..\src\modules\m_sapart.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2485,7 +3030,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_samode.cpp"
+				RelativePath="..\src\modules\m_saquit.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2505,7 +3050,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_sanick.cpp"
+				RelativePath="..\src\modules\m_sasl.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2525,7 +3070,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_sapart.cpp"
+				RelativePath="..\src\modules\m_satopic.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2545,7 +3090,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_saquit.cpp"
+				RelativePath="..\src\modules\m_securelist.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2565,7 +3110,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_securelist.cpp"
+				RelativePath="..\src\modules\m_seenicks.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2585,7 +3130,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_seenicks.cpp"
+				RelativePath="..\src\modules\m_serverban.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2785,7 +3330,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_silence.cpp"
+				RelativePath="..\src\modules\m_shun.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2805,7 +3350,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_silence_ext.cpp"
+				RelativePath="..\src\modules\m_silence.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3124,6 +3669,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_xline_db.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_xmlsocket.cpp"
 				>
@@ -3208,7 +3773,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"
@@ -3267,6 +3892,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"
 					>
@@ -3533,7 +4178,7 @@
 			Name="Command Handlers"
 			>
 			<File
-				RelativePath="..\src\cmd_admin.cpp"
+				RelativePath="..\src\commands\cmd_admin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3553,7 +4198,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_away.cpp"
+				RelativePath="..\src\commands\cmd_away.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3573,7 +4218,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_clearcache.cpp"
+				RelativePath="..\src\commands\cmd_clearcache.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3593,7 +4238,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_commands.cpp"
+				RelativePath="..\src\commands\cmd_commands.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3613,7 +4258,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_connect.cpp"
+				RelativePath="..\src\commands\cmd_connect.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3633,7 +4278,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_die.cpp"
+				RelativePath="..\src\commands\cmd_die.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3653,7 +4298,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_eline.cpp"
+				RelativePath="..\src\commands\cmd_eline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3673,7 +4318,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_gline.cpp"
+				RelativePath="..\src\commands\cmd_gline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3693,7 +4338,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_info.cpp"
+				RelativePath="..\src\commands\cmd_info.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3713,7 +4358,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_invite.cpp"
+				RelativePath="..\src\commands\cmd_invite.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3733,7 +4378,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_ison.cpp"
+				RelativePath="..\src\commands\cmd_ison.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3753,7 +4398,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_join.cpp"
+				RelativePath="..\src\commands\cmd_join.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3773,7 +4418,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_kick.cpp"
+				RelativePath="..\src\commands\cmd_kick.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3793,7 +4438,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_kill.cpp"
+				RelativePath="..\src\commands\cmd_kill.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3813,7 +4458,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_kline.cpp"
+				RelativePath="..\src\commands\cmd_kline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3833,7 +4478,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_links.cpp"
+				RelativePath="..\src\commands\cmd_links.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3853,7 +4498,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_list.cpp"
+				RelativePath="..\src\commands\cmd_list.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3873,7 +4518,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_loadmodule.cpp"
+				RelativePath="..\src\commands\cmd_loadmodule.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3893,7 +4538,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_lusers.cpp"
+				RelativePath="..\src\commands\cmd_lusers.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3913,7 +4558,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_map.cpp"
+				RelativePath="..\src\commands\cmd_map.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3933,7 +4578,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_mode.cpp"
+				RelativePath="..\src\commands\cmd_mode.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3953,7 +4598,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_modules.cpp"
+				RelativePath="..\src\commands\cmd_modules.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3973,7 +4618,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_motd.cpp"
+				RelativePath="..\src\commands\cmd_motd.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -3993,7 +4638,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_names.cpp"
+				RelativePath="..\src\commands\cmd_names.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4013,7 +4658,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_nick.cpp"
+				RelativePath="..\src\commands\cmd_nick.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4033,7 +4678,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_notice.cpp"
+				RelativePath="..\src\commands\cmd_notice.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4053,7 +4698,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_oper.cpp"
+				RelativePath="..\src\commands\cmd_oper.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4073,7 +4718,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_part.cpp"
+				RelativePath="..\src\commands\cmd_part.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4093,7 +4738,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_pass.cpp"
+				RelativePath="..\src\commands\cmd_pass.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4113,7 +4758,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_ping.cpp"
+				RelativePath="..\src\commands\cmd_ping.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4133,7 +4778,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_pong.cpp"
+				RelativePath="..\src\commands\cmd_pong.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4153,7 +4798,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_privmsg.cpp"
+				RelativePath="..\src\commands\cmd_privmsg.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4173,7 +4818,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_qline.cpp"
+				RelativePath="..\src\commands\cmd_qline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4193,7 +4838,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_quit.cpp"
+				RelativePath="..\src\commands\cmd_quit.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4213,7 +4858,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_rehash.cpp"
+				RelativePath="..\src\commands\cmd_rehash.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4233,7 +4878,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_reloadmodule.cpp"
+				RelativePath="..\src\commands\cmd_reloadmodule.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4253,7 +4898,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_restart.cpp"
+				RelativePath="..\src\commands\cmd_restart.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4273,7 +4918,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_rules.cpp"
+				RelativePath="..\src\commands\cmd_rules.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4293,7 +4938,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_server.cpp"
+				RelativePath="..\src\commands\cmd_server.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4313,7 +4958,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_squit.cpp"
+				RelativePath="..\src\commands\cmd_squit.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4333,7 +4978,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_stats.cpp"
+				RelativePath="..\src\commands\cmd_stats.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4353,7 +4998,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_time.cpp"
+				RelativePath="..\src\commands\cmd_time.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4373,7 +5018,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_topic.cpp"
+				RelativePath="..\src\commands\cmd_topic.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4393,7 +5038,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_trace.cpp"
+				RelativePath="..\src\commands\cmd_trace.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4413,7 +5058,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_unloadmodule.cpp"
+				RelativePath="..\src\commands\cmd_unloadmodule.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4433,7 +5078,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_user.cpp"
+				RelativePath="..\src\commands\cmd_user.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4453,7 +5098,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_userhost.cpp"
+				RelativePath="..\src\commands\cmd_userhost.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4473,7 +5118,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_version.cpp"
+				RelativePath="..\src\commands\cmd_version.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4493,7 +5138,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_wallops.cpp"
+				RelativePath="..\src\commands\cmd_wallops.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4513,7 +5158,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_who.cpp"
+				RelativePath="..\src\commands\cmd_who.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4533,7 +5178,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_whois.cpp"
+				RelativePath="..\src\commands\cmd_whois.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4553,7 +5198,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_whowas.cpp"
+				RelativePath="..\src\commands\cmd_whowas.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4573,7 +5218,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\cmd_zline.cpp"
+				RelativePath="..\src\commands\cmd_zline.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -4593,6 +5238,18 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
+		<Filter
+			Name="Resources"
+			>
+			<File
+				RelativePath=".\inspircd.ico"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.rc"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>