Fix library paths for compilation on my laptop

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

3 files changed, 41 insertions, 40 deletions

diff --git a/win/configureVC80.vcproj b/win/configureVC80.vcproj
index b16492523..080d88b33 100644
--- a/win/configureVC80.vcproj
+++ b/win/configureVC80.vcproj
@@ -64,6 +64,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

 				LinkIncremental="2"

 				GenerateDebugInformation="true"

@@ -97,9 +98,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

+			Name="Release|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="x64Debug_Configure"

+			IntermediateDirectory="Release"

 			ConfigurationType="1"

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

 			CharacterSet="2"

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

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

 				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

@@ -144,11 +143,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"

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

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Release"

+			IntermediateDirectory="x64Debug_Configure"

 			ConfigurationType="1"

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

 			CharacterSet="2"

@@ -197,13 +197,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"

@@ -221,12 +223,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"

diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index 93aaee476..018e1c121 100644
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -67,7 +67,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib mswsock.lib"

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

diff --git a/win/m_spanningtreeVC80.vcproj b/win/m_spanningtreeVC80.vcproj
index 8674ddf30..8336e6f6f 100644
--- a/win/m_spanningtreeVC80.vcproj
+++ b/win/m_spanningtreeVC80.vcproj
@@ -65,7 +65,7 @@
 			/>

 			<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\bin;..\bin\debug\lib"

@@ -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,18 +122,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;WIN64"

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

 			/>

@@ -151,12 +149,13 @@
 				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.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"

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

-				TargetMachine="17"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -184,9 +183,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"

@@ -205,16 +204,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"

 			/>

@@ -232,13 +233,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"