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, 38 insertions, 79 deletions

diff --git a/src/filters/parser/AviSplitter/AviSplitter.vcproj b/src/filters/parser/AviSplitter/AviSplitter.vcproj
index 694d2931f..b68f4df7d 100644
--- a/src/filters/parser/AviSplitter/AviSplitter.vcproj
+++ b/src/filters/parser/AviSplitter/AviSplitter.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"

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

 			<Tool

 				Name="VCLibrarianTool"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

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

@@ -121,7 +118,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -140,7 +136,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode lib|Win32"

+			Name="Release|Win32"

 			ConfigurationType="4"

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

 			UseOfMFC="1"

@@ -182,7 +178,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -201,9 +196,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"

@@ -245,7 +238,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -264,7 +256,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"

@@ -302,11 +295,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				RegisterOutput="true"

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

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

+				ModuleDefinitionFile="AviSplitter.def"

 				DelayLoadDLLs=""

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -336,9 +328,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"

@@ -378,10 +369,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

+				ModuleDefinitionFile="AviSplitter.def"

 				DelayLoadDLLs=""

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -411,7 +402,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"

@@ -452,10 +444,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

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

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

+				ModuleDefinitionFile="AviSplitter.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				LargeAddressAware="2"

@@ -486,9 +478,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"

@@ -529,10 +520,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

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

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

+				ModuleDefinitionFile="AviSplitter.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				LargeAddressAware="2"

@@ -590,7 +581,7 @@
 				RelativePath="stdafx.cpp"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -598,7 +589,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -606,7 +597,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -614,7 +605,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -622,7 +613,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

+					Name="Debug Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -630,7 +621,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|x64"

+					Name="Debug Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -638,7 +629,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -646,7 +637,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -675,23 +666,7 @@
 				RelativePath=".\resource.h"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode lib|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -720,23 +695,7 @@
 				RelativePath=".\AviSplitter.rc"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCResourceCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode lib|x64"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCResourceCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -744,7 +703,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool