imported branch with a lot project modifications regarding the IntDir, OutDir etc

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/newprojects@1952 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 47 insertions, 56 deletions

diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
index 6468b5f37..18e31012c 100644
--- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
+++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1250"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="MpcAudioRendererFilter"

 	ProjectGUID="{D0620EF4-1313-40D5-9069-A82F6FE26994}"

 	RootNamespace="MpcAudioRenderer"

@@ -20,7 +20,8 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Debug Unicode|Win32"

+			Name="Debug Filter|Win32"

+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"

 			ConfigurationType="2"

 			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			UseOfMFC="1"

@@ -58,10 +59,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				RegisterOutput="true"

-				AdditionalDependencies="dsound.lib dsutilDU.lib strmbaseDU.lib Winmm.lib"

+				AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

-				AdditionalLibraryDirectories="..\..\..\..\lib"

+				AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"

 				IgnoreAllDefaultLibraries="false"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

 				SubSystem="2"

@@ -92,9 +92,8 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug Unicode|x64"

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

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

+			Name="Debug Filter|x64"

+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"

 			ConfigurationType="2"

 			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			UseOfMFC="1"

@@ -134,9 +133,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsound.lib dsutilDU.lib strmbaseDU.lib Winmm.lib"

+				AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

-				AdditionalLibraryDirectories="..\..\..\..\lib64"

+				AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -166,7 +165,8 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode|Win32"

+			Name="Release Filter|Win32"

+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"

 			ConfigurationType="2"

 			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

@@ -206,9 +206,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsound.lib dsutilRU.lib strmbaseRU.lib Winmm.lib"

-				OutputFile="..\..\..\..\bin\x86\$(ProjectName).ax"

-				AdditionalLibraryDirectories="..\..\..\..\lib"

+				AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"

+				OutputFile="$(OutDir)\$(ProjectName).ax"

+				AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -240,9 +240,8 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode|x64"

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

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

+			Name="Release Filter|x64"

+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"

 			ConfigurationType="2"

 			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

@@ -282,9 +281,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsound.lib dsutilRU.lib strmbaseRU.lib Winmm.lib"

-				OutputFile="..\..\..\..\bin\x64\$(ProjectName).ax"

-				AdditionalLibraryDirectories="..\..\..\..\lib64"

+				AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"

+				OutputFile="$(OutDir)\$(ProjectName).ax"

+				AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -316,7 +315,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug Unicode lib|Win32"

+			Name="Debug|Win32"

 			ConfigurationType="4"

 			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			UseOfMFC="1"

@@ -355,8 +354,7 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="dsound.lib "

-				OutputFile="..\..\..\..\lib\$(ProjectName)DU.lib"

-				AdditionalLibraryDirectories="..\..\..\..\lib"

+				AdditionalLibraryDirectories=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -375,9 +373,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug Unicode lib|x64"

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

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

+			Name="Debug|x64"

 			ConfigurationType="4"

 			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			UseOfMFC="1"

@@ -418,8 +414,7 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="dsound.lib"

-				OutputFile="..\..\..\..\lib64\$(ProjectName)DU.lib"

-				AdditionalLibraryDirectories="..\..\..\..\lib64"

+				AdditionalLibraryDirectories=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -438,7 +433,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode lib|Win32"

+			Name="Release|Win32"

 			ConfigurationType="4"

 			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

@@ -480,8 +475,7 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="dsound.lib "

-				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

-				AdditionalLibraryDirectories="..\..\..\..\lib"

+				AdditionalLibraryDirectories=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -500,9 +494,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode lib|x64"

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

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

+			Name="Release|x64"

 			ConfigurationType="4"

 			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

@@ -544,8 +536,7 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="dsound.lib "

-				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

-				AdditionalLibraryDirectories="..\..\..\..\lib64"

+				AdditionalLibraryDirectories=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -587,7 +578,7 @@
 				RelativePath="stdafx.cpp"

 				>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

+					Name="Debug Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -595,7 +586,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|x64"

+					Name="Debug Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -603,7 +594,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -611,7 +602,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -619,7 +610,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -627,7 +618,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -635,7 +626,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -643,7 +634,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -677,7 +668,7 @@
 				RelativePath=".\MpcAudioRenderer.rc"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -685,7 +676,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -693,7 +684,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -701,7 +692,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -744,7 +735,7 @@
 					RelativePath=".\SoundTouch\source\3dnow_win.cpp"

 					>

 					<FileConfiguration

-						Name="Debug Unicode|x64"

+						Name="Debug Filter|x64"

 						ExcludedFromBuild="true"

 						>

 						<Tool

@@ -752,7 +743,7 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Release Unicode|x64"

+						Name="Release Filter|x64"

 						ExcludedFromBuild="true"

 						>

 						<Tool

@@ -760,7 +751,7 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Debug Unicode lib|x64"

+						Name="Debug|x64"

 						ExcludedFromBuild="true"

 						>

 						<Tool

@@ -768,7 +759,7 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Release Unicode lib|x64"

+						Name="Release|x64"

 						ExcludedFromBuild="true"

 						>

 						<Tool

@@ -796,7 +787,7 @@
 					RelativePath=".\SoundTouch\source\cpu_detect_x86_win.cpp"

 					>

 					<FileConfiguration

-						Name="Debug Unicode|x64"

+						Name="Debug Filter|x64"

 						ExcludedFromBuild="true"

 						>

 						<Tool

@@ -804,7 +795,7 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Release Unicode|x64"

+						Name="Release Filter|x64"

 						ExcludedFromBuild="true"

 						>

 						<Tool

@@ -812,7 +803,7 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Debug Unicode lib|x64"

+						Name="Debug|x64"

 						ExcludedFromBuild="true"

 						>

 						<Tool

@@ -820,7 +811,7 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

-						Name="Release Unicode lib|x64"

+						Name="Release|x64"

 						ExcludedFromBuild="true"

 						>

 						<Tool