fixes to projects to use standard Miranda paths

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@457 4f64403b-2f21-0410-a795-97e2b3489a10

3 files changed, 161 insertions, 135 deletions

diff --git a/tipper/tipper.vcproj b/tipper/tipper.vcproj
index d6ab78c..0a409fc 100644
--- a/tipper/tipper.vcproj
+++ b/tipper/tipper.vcproj
@@ -86,8 +86,10 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="vc7to6.lib comctl32.lib ws2_32.lib"

 				LinkIncremental="1"

+				AdditionalLibraryDirectories="../../lib"

+				IgnoreAllDefaultLibraries="TRUE"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="TRUE"

 				SubSystem="2"

@@ -194,7 +196,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				IgnoreImportLibrary="TRUE"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="vc7to6.lib comctl32.lib ws2_32.lib"

+				AdditionalLibraryDirectories="../../lib"

+				IgnoreAllDefaultLibraries="TRUE"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="TRUE"

 				GenerateMapFile="TRUE"

diff --git a/tipper/tipper_8.vcproj b/tipper/tipper_8.vcproj
index a323ea0..494ca37 100644
--- a/tipper/tipper_8.vcproj
+++ b/tipper/tipper_8.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="tipper"

 	ProjectGUID="{2C818919-A38F-44FF-BD91-A6A204AC592A}"

 	RootNamespace="tipper"

@@ -17,10 +17,10 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

 			ConfigurationType="2"

-			CharacterSet="2"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -41,12 +41,13 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;MICROSOFT_LAYER_FOR_UNICODE=1"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="3"

+				BufferSecurityCheck="true"

 				PrecompiledHeaderThrough="common.h"

+				WarningLevel="3"

 				DebugInformationFormat="4"

 				DisableSpecificWarnings="4996"

 			/>

@@ -61,10 +62,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="unicows.lib comctl32.lib ws2_32.lib comdlg32.lib"

+				AdditionalDependencies="comctl32.lib ws2_32.lib"

 				LinkIncremental="2"

-				GenerateManifest="true"

-				AdditionalManifestDependencies="&quot;type=&apos;Win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;X86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;&quot;"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				TargetMachine="1"

@@ -96,11 +95,10 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

 			ConfigurationType="2"

 			CharacterSet="1"

-			WholeProgramOptimization="0"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -119,13 +117,13 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="1"

+				Optimization="3"

 				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="2"

 				PrecompiledHeaderThrough="common.h"

+				WarningLevel="3"

 				DebugInformationFormat="3"

 				DisableSpecificWarnings="4996"

 			/>

@@ -140,16 +138,14 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="unicows.lib comctl32.lib ws2_32.lib  comdlg32.lib"

+				AdditionalDependencies="comctl32.lib ws2_32.lib"

 				LinkIncremental="1"

-				GenerateManifest="false"

-				AdditionalManifestDependencies="&quot;type=&apos;Win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;X86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;&quot;"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				ImportLibrary="$(IntDir)/$(TargetName).lib"

+				OptimizeForWindows98="1"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -157,7 +153,6 @@
 			/>

 			<Tool

 				Name="VCManifestTool"

-				EmbedManifest="false"

 			/>

 			<Tool

 				Name="VCXDCMakeTool"

@@ -179,12 +174,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release (ansi)|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			Name="Debug Unicode|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

 			ConfigurationType="2"

-			CharacterSet="2"

-			WholeProgramOptimization="0"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -203,13 +197,96 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="1"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				BufferSecurityCheck="true"

+				PrecompiledHeaderThrough="common.h"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+				DisableSpecificWarnings="4996"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				IgnoreImportLibrary="true"

+				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Unicode|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="3"

+				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="2"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

 				PrecompiledHeaderThrough="common.h"

+				WarningLevel="3"

 				DebugInformationFormat="3"

 				DisableSpecificWarnings="4996"

 			/>

@@ -224,16 +301,15 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

-				LinkIncremental="1"

-				GenerateManifest="false"

-				AdditionalManifestDependencies="&quot;type=&apos;Win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;X86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;&quot;"

-				IgnoreDefaultLibraryNames=""

+				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="true"

+				GenerateMapFile="true"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				ImportLibrary="$(IntDir)/$(TargetName).lib"

+				OptimizeForWindows98="1"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -241,7 +317,6 @@
 			/>

 			<Tool

 				Name="VCManifestTool"

-				EmbedManifest="false"

 			/>

 			<Tool

 				Name="VCXDCMakeTool"

@@ -274,86 +349,14 @@
 			<File

 				RelativePath=".\message_pump.cpp"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release (ansi)|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\options.cpp"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release (ansi)|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\popwin.cpp"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release (ansi)|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="2"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\str_utils.cpp"

@@ -383,7 +386,15 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release (ansi)|Win32"

+					Name="Debug Unicode|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Unicode|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -406,10 +417,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\m_tipper.h"

-				>

-			</File>

-			<File

 				RelativePath=".\message_pump.h"

 				>

 			</File>

@@ -430,10 +437,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\subst.h"

-				>

-			</File>

-			<File

 				RelativePath=".\tipper.h"

 				>

 			</File>

@@ -475,7 +478,15 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release (ansi)|Win32"

+					Name="Debug Unicode|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Unicode|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -503,7 +514,15 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release (ansi)|Win32"

+					Name="Debug Unicode|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Unicode|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

diff --git a/tipper/tipper_9.vcproj b/tipper/tipper_9.vcproj
index d1b79ca..4a475f7 100644
--- a/tipper/tipper_9.vcproj
+++ b/tipper/tipper_9.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="tipper"

 	ProjectGUID="{2C818919-A38F-44FF-BD91-A6A204AC592A}"

 	RootNamespace="tipper"

@@ -66,8 +66,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

-				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

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

 		<Configuration

 			Name="Debug|x64"

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

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

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"

 			ConfigurationType="2"

 			CharacterSet="1"

 			>

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

 			<Tool

 				Name="VCLinkerTool"

+				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

-				LinkIncremental="1"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

+				OptimizeForWindows98="0"

 				LinkTimeCodeGeneration="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -263,8 +265,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|x64"

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

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

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"

 			ConfigurationType="2"

 			CharacterSet="1"

 			>

@@ -398,11 +400,11 @@
 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

-				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -429,8 +431,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|x64"

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

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

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"

 			ConfigurationType="2"

 			CharacterSet="1"

 			>

@@ -512,6 +514,7 @@
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

 			ConfigurationType="2"

 			CharacterSet="1"

+			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -564,13 +567,13 @@
 				AdditionalDependencies="comctl32.lib ws2_32.lib"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="true"

-				GenerateMapFile="true"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

 				LinkTimeCodeGeneration="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -597,8 +600,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release Unicode|x64"

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

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

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"

 			ConfigurationType="2"

 			CharacterSet="1"

 			>