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, 45 insertions, 54 deletions

diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcproj b/src/filters/parser/MP4Splitter/MP4Splitter.vcproj
index e0a99354d..02f804b31 100644
--- a/src/filters/parser/MP4Splitter/MP4Splitter.vcproj
+++ b/src/filters/parser/MP4Splitter/MP4Splitter.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"

 				AdditionalOptions="/IGNORE:4221"

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

@@ -246,7 +239,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4221"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -265,7 +257,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"

@@ -304,12 +297,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				RegisterOutput="true"

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

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

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

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

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

 				IgnoreDefaultLibraryNames="libc.lib"

-				ModuleDefinitionFile="$(ProjectName).def"

+				ModuleDefinitionFile="MP4Splitter.def"

 				DelayLoadDLLs=""

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -339,9 +331,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"

@@ -382,11 +373,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

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

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

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

 				IgnoreDefaultLibraryNames="libc.lib"

-				ModuleDefinitionFile="$(ProjectName).def"

+				ModuleDefinitionFile="MP4Splitter.def"

 				DelayLoadDLLs=""

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -416,7 +407,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"

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

 			<Tool

 				Name="VCLinkerTool"

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

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

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

+				ModuleDefinitionFile="MP4Splitter.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				LargeAddressAware="2"

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

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

 			<Tool

 				Name="VCLinkerTool"

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

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

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

-				ModuleDefinitionFile="$(ProjectName).def"

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

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

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

+				ModuleDefinitionFile="MP4Splitter.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				LargeAddressAware="2"

@@ -587,7 +578,7 @@
 				RelativePath="MP4Splitter.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"

@@ -615,7 +606,7 @@
 				RelativePath="stdafx.cpp"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

+					Name="Debug Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|x64"

+					Name="Debug Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -663,7 +654,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -671,7 +662,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -696,7 +687,7 @@
 				RelativePath=".\resource.h"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -704,7 +695,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -720,7 +711,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -741,7 +732,7 @@
 				RelativePath=".\MP4Splitter.rc"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -749,7 +740,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -757,7 +748,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -765,7 +756,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -904,7 +895,7 @@
 					RelativePath=".\AP4\Source\Core\Ap4DcomAtom.h"

 					>

 					<FileConfiguration

-						Name="Debug Unicode lib|Win32"

+						Name="Debug|Win32"

 						>

 						<Tool

 							Name="VCCustomBuildTool"