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

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj
index 666dd5641..0f14c1966 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj
@@ -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="idct_mmx.obj motion_comp_mmx.obj decssDU.lib dsutilDU.lib strmbaseDU.lib basevideofilterDU.lib Winmm.lib  detours.lib"

+				AdditionalDependencies="idct_mmx.obj motion_comp_mmx.obj decss.lib dsutil.lib strmbase.lib basevideofilter.lib Winmm.lib detours.lib"

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

-				AdditionalLibraryDirectories="..\..\..\..\lib;..\..\..\..\lib\detours"

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

 				ModuleDefinitionFile="Mpeg2DecFilter.def"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

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

 			<Tool

 				Name="VCManifestTool"

-				EmbedManifest="false"

 			/>

 			<Tool

 				Name="VCXDCMakeTool"

@@ -92,11 +91,12 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug Unicode|x64"

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

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

+			Name="Debug Filter|x64"

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

 			ConfigurationType="1"

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

 			UseOfMFC="1"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -129,6 +129,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

 			/>

@@ -155,7 +157,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"

@@ -195,9 +198,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="idct_mmx.obj motion_comp_mmx.obj decssRU.lib dsutilRU.lib strmbaseRU.lib basevideofilterRU.lib Winmm.lib detours.lib"

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

-				AdditionalLibraryDirectories="..\..\..\..\lib;..\..\..\..\lib\detours"

+				AdditionalDependencies="idct_mmx.obj motion_comp_mmx.obj decss.lib dsutil.lib strmbase.lib basevideofilter.lib Winmm.lib detours.lib"

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

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

 				ModuleDefinitionFile="Mpeg2DecFilter.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -229,11 +232,12 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode|x64"

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

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

+			Name="Release Filter|x64"

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

 			ConfigurationType="1"

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

 			UseOfMFC="1"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -267,7 +271,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

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

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

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

 				GenerateDebugInformation="true"

 				LargeAddressAware="2"

 				RandomizedBaseAddress="2"

@@ -296,7 +301,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug Unicode lib|Win32"

+			Name="Debug|Win32"

 			ConfigurationType="4"

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

 			UseOfMFC="1"

@@ -334,9 +339,8 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="basevideofilterDU.lib idct_mmx.obj motion_comp_mmx.obj"

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

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

+				AdditionalDependencies="basevideofilter.lib idct_mmx.obj motion_comp_mmx.obj"

+				AdditionalLibraryDirectories="$(OutDir)"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -355,9 +359,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"

@@ -397,9 +399,8 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="basevideofilterDU.lib"

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

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

+				AdditionalDependencies="basevideofilter.lib"

+				AdditionalLibraryDirectories="$(OutDir)"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -418,7 +419,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode lib|Win32"

+			Name="Release|Win32"

 			ConfigurationType="4"

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

 			UseOfMFC="1"

@@ -460,9 +461,8 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4221"

-				AdditionalDependencies="basevideofilterRU.lib idct_mmx.obj motion_comp_mmx.obj"

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

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

+				AdditionalDependencies="basevideofilter.lib idct_mmx.obj motion_comp_mmx.obj"

+				AdditionalLibraryDirectories="$(OutDir)"

 			/>

 			<Tool

 				Name="VCALinkTool"

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

@@ -511,7 +509,7 @@
 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="_WIN64;NDEBUG"

 				BufferSecurityCheck="true"

-				EnableEnhancedInstructionSet="0"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -525,9 +523,8 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4221"

-				AdditionalDependencies="basevideofilterRU.lib"

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

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

+				AdditionalDependencies="basevideofilter.lib"

+				AdditionalLibraryDirectories="$(OutDir)"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -557,7 +554,7 @@
 				RelativePath=".\idct_sse2.cpp"

 				>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -565,7 +562,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -577,7 +574,7 @@
 				RelativePath=".\libmpeg2.cpp"

 				>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -597,7 +594,7 @@
 				RelativePath=".\mc_sse2.cpp"

 				>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -617,7 +614,7 @@
 				RelativePath=".\Mpeg2DecFilter.cpp"

 				>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -641,7 +638,7 @@
 				RelativePath="stdafx.cpp"

 				>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

+					Name="Debug Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|x64"

+					Name="Debug Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -673,7 +670,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -681,7 +678,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -689,7 +686,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -697,7 +694,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -763,7 +760,7 @@
 				RelativePath=".\Mpeg2DecFilter.rc"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -779,7 +776,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -787,7 +784,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool