Some fixes for the VS project file. Spanningtree builds again.

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

1 files changed, 53 insertions, 73 deletions

diff --git a/win/m_spanningtreeVC90.vcproj b/win/m_spanningtreeVC90.vcproj
index aa2e91444..785416986 100644
--- a/win/m_spanningtreeVC90.vcproj
+++ b/win/m_spanningtreeVC90.vcproj
@@ -101,9 +101,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

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

-			IntermediateDirectory="x64Debug_spanningtree"

+			Name="Release|Win32"

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

+			IntermediateDirectory="Release"

 			ConfigurationType="2"

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

 			CharacterSet="2"

@@ -122,19 +122,19 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

+				AdditionalOptions="/MP"

+				Optimization="1"

+				WholeProgramOptimization="true"

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

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

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

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

+				MinimalRebuild="false"

+				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

+				WarningLevel="2"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -148,17 +148,19 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"

+				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"

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

 				LinkIncremental="1"

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

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

 				GenerateDebugInformation="true"

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

 				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				LinkTimeCodeGeneration="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

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

-				TargetMachine="17"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -180,12 +182,14 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				Description="Re-basing shared objects..."

+				CommandLine="@cd $(InputDir)&#x0D;&#x0A;@&quot;$(InputDir)\rebase.bat&quot;&#x0D;&#x0A;"

 			/>

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

@@ -204,19 +208,19 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

-				Optimization="1"

-				WholeProgramOptimization="true"

+				Optimization="0"

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

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

-				MinimalRebuild="false"

-				RuntimeLibrary="2"

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

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				WarningLevel="2"

-				Detect64BitPortabilityProblems="false"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -230,19 +234,17 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"

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

-				LinkTimeCodeGeneration="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

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

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -264,8 +266,6 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				Description="Re-basing shared objects..."

-				CommandLine="@cd $(InputDir)&#x0D;&#x0A;@&quot;$(InputDir)\rebase.bat&quot;&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

@@ -368,6 +368,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_spanningtree\away.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_spanningtree\cachetimer.cpp"

 				>

 			</File>

@@ -376,6 +380,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_spanningtree\compat.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_spanningtree\delline.cpp"

 				>

 			</File>

@@ -388,6 +396,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_spanningtree\fident.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_spanningtree\fjoin.cpp"

 				>

 			</File>

@@ -404,10 +416,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\handshaketimer.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\src\modules\m_spanningtree\hmac.cpp"

 				>

 			</File>

@@ -424,18 +432,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\modules.cpp"

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\modules_spanningtree.obj"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\src\modules\m_spanningtree\motd.cpp"

 				>

 			</File>

@@ -464,10 +460,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\override_modules.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\src\modules\m_spanningtree\override_motd.cpp"

 				>

 			</File>

@@ -504,18 +496,10 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\privmsg.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\src\modules\m_spanningtree\protocolinterface.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\protocolinterface.h"

-				>

-			</File>

-			<File

 				RelativePath="..\src\modules\m_spanningtree\push.cpp"

 				>

 			</File>

@@ -532,16 +516,12 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_spanningtree\save.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_spanningtree\server.cpp"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\servers_spanningtree.obj"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\src\modules\m_spanningtree\stats.cpp"

@@ -602,15 +582,15 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\handshaketimer.h"

+				RelativePath="..\src\modules\m_spanningtree\link.h"

 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\link.h"

+				RelativePath="..\src\modules\m_spanningtree\main.h"

 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\main.h"

+				RelativePath="..\src\modules\m_spanningtree\protocolinterface.h"

 				>

 			</File>

 			<File