* Fixed IOCPEngine under x64 (because of incorrect pointer sizes)

- Fixed configure / VC8 projects for x64 compiling.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7293 e03df62e-2008-0410-955e-edbf42e46eb7

5 files changed, 84 insertions, 81 deletions

diff --git a/src/socketengine_iocp.cpp b/src/socketengine_iocp.cpp
index 58ce36177..82462f8b9 100644
--- a/src/socketengine_iocp.cpp
+++ b/src/socketengine_iocp.cpp
@@ -46,8 +46,9 @@ bool IOCPEngine::AddFd(EventHandler* eh)
 	eh->m_writeEvent = 0;
 	eh->m_acceptEvent = 0;
 
+	unsigned long completion_key = (ULONG_PTR)eh->m_internalFd;
 	/* assign the socket to the completion port */
-	if(!CreateIoCompletionPort((HANDLE)eh->GetFd(), m_completionPort, (ULONG_PTR)eh->m_internalFd, 0))
+	if(!CreateIoCompletionPort((HANDLE)eh->GetFd(), m_completionPort, completion_key, 0))
 		return false;
 
 	/* set up binding, increase set size */
@@ -124,16 +125,18 @@ void IOCPEngine::WantWrite(EventHandler* eh)
 	/* Post event - write begin */
 	if(!eh->m_writeEvent)
 	{
+		ULONG_PTR completion_key = (ULONG_PTR)eh->m_internalFd;
 		Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_WRITE_READY, 0);
 		eh->m_writeEvent = (void*)ov;
-		PostQueuedCompletionStatus(m_completionPort, 0, (ULONG_PTR)eh->m_internalFd, &ov->m_overlap);
+		PostQueuedCompletionStatus(m_completionPort, 0, completion_key, &ov->m_overlap);
 	}
 }
 
 bool IOCPEngine::PostCompletionEvent(EventHandler * eh, SocketIOEvent type, int param)
 {
 	Overlapped * ov = new Overlapped(type, param);
-	return PostQueuedCompletionStatus(m_completionPort, 0, (ULONG_PTR)eh->m_internalFd, &ov->m_overlap);
+	ULONG_PTR completion_key = (ULONG_PTR)eh->m_internalFd;
+	return PostQueuedCompletionStatus(m_completionPort, 0, completion_key, &ov->m_overlap);
 }
 
 void IOCPEngine::PostReadEvent(EventHandler * eh)
@@ -206,11 +209,11 @@ int IOCPEngine::DispatchEvents()
 	LPOVERLAPPED overlap;
 	Overlapped * ov;
 	EventHandler * eh;
-	int intfd;
+	ULONG_PTR intfd;
 	int ret;
 	unsigned long bytes_recv;
 
-	while(GetQueuedCompletionStatus(m_completionPort, &len, (PULONG_PTR)&intfd, &overlap, 1000))
+	while(GetQueuedCompletionStatus(m_completionPort, &len, &intfd, &overlap, 1000))
 	{
 		// woot, we got an event on a socket :P
 		eh = ref[intfd];
diff --git a/win/configure.cpp b/win/configure.cpp
index debd659b8..6f0396bae 100644
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -405,13 +405,13 @@ void WriteCompileCommands()
 #ifdef WIN64

 	// /MACHINE:X64

 	#ifdef _DEBUG

-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\debug\\bin\\inspircd.lib /OUT:\"..\\bin\\debug\\lib\\$*.so\" /PDB:\"..\\bin\\debug\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\bin\\debug\\lib\\$*.lib\"\n\n");

+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\debug_x64\\bin\\inspircd.lib /OUT:\"..\\bin\\debug_x64\\lib\\$*.so\" /PDB:\"..\\bin\\debug_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\bin\\debug_x64\\lib\\$*.lib\"\n\n");

 		CreateDirectory("..\\src\\debug", NULL);

 		CreateDirectory("..\\bin\\debug\\bin", NULL);

 		CreateDirectory("..\\bin\\debug\\lib", NULL);

 		CreateDirectory("..\\bin\\debug\\modules", NULL);

 	#else

-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\release\\bin\\inspircd.lib /OUT:\"..\\bin\\release\\lib\\$*.so\" /PDB:\"..\\bin\\release\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\bin\\release\\lib\\$*.lib\"\n\n");

+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\release_x64\\bin\\inspircd.lib /OUT:\"..\\bin\\release_x64\\lib\\$*.so\" /PDB:\"..\\bin\\release_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\bin\\release_x64\\lib\\$*.lib\"\n\n");

 		CreateDirectory("..\\src\\release", NULL);

 		CreateDirectory("..\\bin\\release\\bin", NULL);

 		CreateDirectory("..\\bin\\release\\lib", NULL);

@@ -482,11 +482,11 @@ void WriteCompileModules()
 #ifdef WIN64

 	// /MACHINE:X64

 	#ifdef _DEBUG

-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n");

-		CreateDirectory("..\\src\\modules\\debug", NULL);

+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n");

+		CreateDirectory("..\\src\\modules\\debug_x64", NULL);

 	#else

-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n");

-		CreateDirectory("..\\src\\modules\\release", NULL);

+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n");

+		CreateDirectory("..\\src\\modules\\release_x64", NULL);

 	#endif

 #else

 	#ifdef _DEBUG

diff --git a/win/configureVC80.vcproj b/win/configureVC80.vcproj
index 23cbac5c2..b16492523 100644
--- a/win/configureVC80.vcproj
+++ b/win/configureVC80.vcproj
@@ -97,9 +97,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Release"

+			IntermediateDirectory="x64Debug_Configure"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

@@ -118,13 +118,15 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WIN64"

 				MinimalRebuild="true"

-				RuntimeLibrary="0"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

@@ -142,12 +144,11 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/configure.exe"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/configure.pdb"

 				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -175,9 +176,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			Name="Release|Win32"

+			OutputDirectory="."

+			IntermediateDirectory="Release"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

@@ -196,15 +197,13 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

 				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

@@ -222,11 +221,12 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/configure.exe"

-				LinkIncremental="2"

+				LinkIncremental="1"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/configure.pdb"

 				SubSystem="2"

-				TargetMachine="17"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -255,8 +255,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			OutputDirectory="."

+			IntermediateDirectory="x64Release_Configure"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index d7e396976..6a1cde8ee 100644
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -105,17 +105,17 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\bin\release\bin"

-			IntermediateDirectory="Release"

+			Name="Debug|x64"

+			OutputDirectory="..\bin\debug_x64\bin"

+			IntermediateDirectory="x64DebugVc80"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				Description="running configure..."

-				CommandLine="$(InputDir)\configure.exe&#x0D;&#x0A;"

+				Description=""

+				CommandLine=""

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -128,14 +128,16 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN64"

 				MinimalRebuild="true"

-				RuntimeLibrary="0"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

@@ -153,13 +155,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib mswsock.lib"

+				ShowProgress="0"

 				OutputFile="$(OutDir)/inspircd.exe"

 				LinkIncremental="1"

+				IgnoreDefaultLibraryNames=""

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/inspircd.pdb"

 				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				TargetMachine="17"

+				FixedBaseAddress="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -184,13 +188,13 @@
 			/>

 			<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=""

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			Name="Release|Win32"

+			OutputDirectory="..\bin\release\bin"

+			IntermediateDirectory="Release"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

@@ -198,7 +202,7 @@
 			<Tool

 				Name="VCPreBuildEventTool"

 				Description="running configure..."

-				CommandLine="&quot;$(InputDir)\configure.exe&quot;"

+				CommandLine="$(InputDir)\configure.exe&#x0D;&#x0A;"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -211,16 +215,14 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

@@ -238,15 +240,13 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib mswsock.lib"

-				ShowProgress="0"

 				OutputFile="$(OutDir)/inspircd.exe"

 				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/inspircd.pdb"

 				SubSystem="1"

-				TargetMachine="17"

-				FixedBaseAddress="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -276,8 +276,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			OutputDirectory="..\bin\release_x64\bin"

+			IntermediateDirectory="x64ReleaseVc80"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

diff --git a/win/m_spanningtreeVC80.vcproj b/win/m_spanningtreeVC80.vcproj
index 8755650d2..8674ddf30 100644
--- a/win/m_spanningtreeVC80.vcproj
+++ b/win/m_spanningtreeVC80.vcproj
@@ -101,9 +101,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\bin\release\modules"

-			IntermediateDirectory="Release"

+			Name="Debug|x64"

+			OutputDirectory="..\bin\debug_x64\modules"

+			IntermediateDirectory="x64Debug_spanningtree"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

@@ -122,16 +122,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64"

 				MinimalRebuild="true"

-				RuntimeLibrary="0"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				WarningLevel="2"

+				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

@@ -149,13 +151,12 @@
 				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"

 				OutputFile="$(OutDir)/m_spanningtree.so"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"

+				AdditionalLibraryDirectories="..\bin\debug_x64\bin;..\bin\debug_x64\lib"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/m_spanningtree.pdb"

 				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

 				ImportLibrary="$(OutDir)/m_spanningtree.lib"

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -183,9 +184,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			Name="Release|Win32"

+			OutputDirectory="..\bin\release\modules"

+			IntermediateDirectory="Release"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

@@ -204,18 +205,16 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD"

 				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

-				WarningLevel="3"

+				WarningLevel="2"

 				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

@@ -233,12 +232,13 @@
 				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"

 				OutputFile="$(OutDir)/m_spanningtree.so"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\bin\debug\bin;..\bin\debug\lib"

+				AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/m_spanningtree.pdb"

 				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

 				ImportLibrary="$(OutDir)/m_spanningtree.lib"

-				TargetMachine="17"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -267,8 +267,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			OutputDirectory="..\bin\release_x64\modules"

+			IntermediateDirectory="x64Release_spanningtree"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

@@ -315,7 +315,7 @@
 				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"

 				OutputFile="$(OutDir)/m_spanningtree.so"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"

+				AdditionalLibraryDirectories="..\bin\release_x64\bin;..\bin\release_x64\lib"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"