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/transform/MpaDecFilter/MpaDecFilter.vcproj b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj
index b18346921..de7c4e59e 100644
--- a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj
+++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.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="filtersDU.lib libvorbisidecD.lib libfaad2D.lib libmadD.lib liba52D.lib libdcaD.lib libflacD.lib decssDU.lib dsutilDU.lib strmbaseDU.lib Winmm.lib libavcodecD.lib zlibD.lib"

+				AdditionalDependencies="filters.lib libvorbisidec.lib libfaad2.lib libmad.lib liba52.lib libdca.lib libflac.lib decss.lib dsutil.lib strmbase.lib Winmm.lib libavcodec.lib zlib.lib"

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

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

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

 				ModuleDefinitionFile="MpaDecFilter.def"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

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

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

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="filtersDU.lib libvorbisidecD.lib libfaad2D.lib libmadD.lib liba52D.lib libdcaD.lib libflacD.lib decssDU.lib dsutilDU.lib strmbaseDU.lib Winmm.lib libavcodecD.lib zlibD.lib"

+				AdditionalDependencies="filters.lib libvorbisidec.lib libfaad2.lib libmad.lib liba52.lib libdca.lib libflac.lib decss.lib dsutil.lib strmbase.lib Winmm.lib libavcodec.lib zlib.lib"

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

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

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

 				ModuleDefinitionFile="MpaDecFilter.def"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -165,7 +164,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"

@@ -205,9 +205,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="filtersRU.lib libvorbisidecR.lib libfaad2R.lib libmadR.lib liba52R.lib libdcaR.lib libflac.lib decssRU.lib dsutilRU.lib strmbaseRU.lib Winmm.lib libavcodec_gcc.lib libgcc.a libmingwex.a zlibR.lib"

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

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

+				AdditionalDependencies="filters.lib libvorbisidec.lib libfaad2.lib libmad.lib liba52.lib libdca.lib libflac.lib decss.lib dsutil.lib strmbase.lib Winmm.lib libavcodec_gcc.lib libgcc.a libmingwex.a zlib.lib"

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

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

 				ModuleDefinitionFile="MpaDecFilter.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

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

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

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="filtersRU.lib libvorbisidecR.lib libfaad2R.lib libmadR.lib liba52R.lib libdcaR.lib libflac.lib decssRU.lib dsutilRU.lib strmbaseRU.lib Winmm.lib libavcodec_gcc.lib libgcc.a libmingwex.a zlibR.lib"

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

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

+				AdditionalDependencies="filters.lib libvorbisidec.lib libfaad2.lib libmad.lib liba52.lib libdca.lib libflac.lib decss.lib dsutil.lib strmbase.lib Winmm.lib libavcodec_gcc.lib libgcc.a libmingwex.a zlib.lib"

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

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

 				ModuleDefinitionFile="MpaDecFilter.def"

 				GenerateDebugInformation="true"

 				SubSystem="2"

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

 		</Configuration>

 		<Configuration

-			Name="Debug Unicode lib|Win32"

+			Name="Debug|Win32"

 			ConfigurationType="4"

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

 			UseOfMFC="1"

@@ -353,9 +352,8 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="libfaad2D.lib libmadD.lib libdcaD.lib liba52D.lib libflacD.lib"

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

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

+				AdditionalDependencies="libfaad2.lib libmad.lib libdca.lib liba52.lib libflac.lib"

+				AdditionalLibraryDirectories="$(OutDir)"

 			/>

 			<Tool

 				Name="VCALinkTool"

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

@@ -416,9 +412,8 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="libfaad2D.lib libmadD.lib libdcaD.lib liba52D.lib libflacD.lib"

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

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

+				AdditionalDependencies="libfaad2.lib libmad.lib libdca.lib liba52.lib libflac.lib"

+				AdditionalLibraryDirectories="$(OutDir)"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -437,7 +432,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode lib|Win32"

+			Name="Release|Win32"

 			ConfigurationType="4"

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

 			UseOfMFC="1"

@@ -479,9 +474,8 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="libfaad2R.lib libmadR.lib libdcaR.lib liba52R.lib libflac.lib"

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

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

+				AdditionalDependencies="libfaad2.lib libmad.lib libdca.lib liba52.lib libflac.lib"

+				AdditionalLibraryDirectories="$(OutDir)"

 			/>

 			<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,9 +536,8 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="libfaad2R.lib libmadR.lib libdcaR.lib liba52R.lib libflac.lib"

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

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

+				AdditionalDependencies="libfaad2.lib libmad.lib libdca.lib liba52.lib libflac.lib"

+				AdditionalLibraryDirectories="$(OutDir)"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -584,7 +575,7 @@
 				RelativePath="stdafx.cpp"

 				>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

+					Name="Debug Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -592,7 +583,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|x64"

+					Name="Debug Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -600,7 +591,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release Filter|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -608,7 +599,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|x64"

+					Name="Release Filter|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -616,7 +607,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -624,7 +615,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -682,7 +673,7 @@
 				RelativePath=".\MpaDecFilter.rc"

 				>

 				<FileConfiguration

-					Name="Debug Unicode lib|Win32"

+					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode lib|x64"

+					Name="Debug|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|Win32"

+					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

 					<Tool

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

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode lib|x64"

+					Name="Release|x64"

 					ExcludedFromBuild="true"

 					>

 					<Tool