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, 42 insertions, 51 deletions

diff --git a/src/filters/parser/StreamDriveThru/streamdrivethru.vcproj b/src/filters/parser/StreamDriveThru/streamdrivethru.vcproj
index 5b0ef88c3..2cd3cd47d 100644
--- a/src/filters/parser/StreamDriveThru/streamdrivethru.vcproj
+++ b/src/filters/parser/StreamDriveThru/streamdrivethru.vcproj
@@ -20,7 +20,7 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Debug Unicode lib|Win32"

+			Name="Debug|Win32"

 			ConfigurationType="4"

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

 			UseOfMFC="1"

@@ -58,7 +58,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -77,9 +76,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"

@@ -119,7 +116,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -138,7 +134,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode lib|Win32"

+			Name="Release|Win32"

 			ConfigurationType="4"

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

 			UseOfMFC="1"

@@ -180,7 +176,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4221"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -199,9 +194,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"

@@ -243,7 +236,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4221"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -262,7 +254,8 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug Unicode|Win32"

+			Name="Debug Filter|Win32"

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

 			ConfigurationType="2"

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

 			UseOfMFC="1"

@@ -300,11 +293,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				RegisterOutput="true"

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

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

+				ModuleDefinitionFile="StreamDriveThru.def"

 				DelayLoadDLLs=""

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -334,9 +326,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"

@@ -376,10 +367,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

+				ModuleDefinitionFile="StreamDriveThru.def"

 				DelayLoadDLLs=""

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -409,7 +400,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"

@@ -449,10 +441,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

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

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

+				ModuleDefinitionFile="StreamDriveThru.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				LargeAddressAware="2"

@@ -483,9 +475,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"

@@ -525,10 +516,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

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

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

+				ModuleDefinitionFile="StreamDriveThru.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				LargeAddressAware="2"

@@ -570,7 +561,7 @@
 				RelativePath="stdafx.cpp"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -578,7 +569,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

+					Name="Debug Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|x64"

+					Name="Debug Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -651,7 +642,7 @@
 				RelativePath=".\resource.h"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -659,7 +650,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -667,7 +658,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -675,7 +666,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -700,7 +691,7 @@
 				RelativePath=".\streamdrivethru.rc"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -708,7 +699,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -716,7 +707,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -724,7 +715,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool