diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-05-28 03:19:07 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-05-28 03:19:07 +0400 |
| commit | 3be2f933378ed8c2534eb8a80454fb3965a9b1a1 (patch) | |
| tree | b8f7eb3cfd560d1278aa6b51e0158771fc07b849 | |
| parent | 225abb8ecc847321c0dffcbb58bfe4cb5714c0f8 (diff) | |
everything compiled goes in the bin folder plus project files cleanup
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/newprojects@1962 10f7b99b-c216-0410-bff0-8a66a9350fd8
67 files changed, 933 insertions, 923 deletions
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj b/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj index 1d4dc803c..bbe9b8fe4 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -48,11 +48,6 @@ Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- BufferSecurityCheck="true"
- EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="1"
- WarningLevel="3"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -65,8 +60,7 @@ />
<Tool
Name="VCLinkerTool"
- LinkIncremental="1"
- ModuleDefinitionFile=".\mpciconlib.def"
+ ModuleDefinitionFile="mpciconlib.def"
GenerateDebugInformation="false"
SubSystem="2"
LargeAddressAware="2"
@@ -101,7 +95,7 @@ </Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -125,7 +119,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="_WIN64;NDEBUG;_WINDOWS"
- BufferSecurityCheck="true"
+ EnableEnhancedInstructionSet="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -138,8 +132,7 @@ />
<Tool
Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
- ModuleDefinitionFile=".\mpciconlib.def"
+ ModuleDefinitionFile="mpciconlib.def"
GenerateDebugInformation="false"
LargeAddressAware="2"
ResourceOnlyDLL="true"
diff --git a/src/apps/mplayerc/mpcresources/mpcresources.vcproj b/src/apps/mplayerc/mpcresources/mpcresources.vcproj index a1c7e56f9..ae8f4e104 100644 --- a/src/apps/mplayerc/mpcresources/mpcresources.vcproj +++ b/src/apps/mplayerc/mpcresources/mpcresources.vcproj @@ -21,8 +21,8 @@ <Configurations>
<Configuration
Name="Release French|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -64,7 +64,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).fr.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -99,8 +98,8 @@ </Configuration>
<Configuration
Name="Release French|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -143,7 +142,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).fr.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -178,8 +176,8 @@ </Configuration>
<Configuration
Name="Release German|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -221,7 +219,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).de.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -256,8 +253,8 @@ </Configuration>
<Configuration
Name="Release German|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -300,7 +297,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).de.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -335,8 +331,8 @@ </Configuration>
<Configuration
Name="Release Russian|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -378,7 +374,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ru.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -413,8 +408,8 @@ </Configuration>
<Configuration
Name="Release Russian|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -457,7 +452,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ru.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -492,8 +486,8 @@ </Configuration>
<Configuration
Name="Release Turkish|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -535,7 +529,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).tr.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -570,8 +563,8 @@ </Configuration>
<Configuration
Name="Release Turkish|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -614,7 +607,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).tr.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -649,8 +641,8 @@ </Configuration>
<Configuration
Name="Release Czech|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -692,7 +684,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).cz.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -727,8 +718,8 @@ </Configuration>
<Configuration
Name="Release Czech|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -771,7 +762,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).cz.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -806,8 +796,8 @@ </Configuration>
<Configuration
Name="Release Spanish|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -849,7 +839,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).es.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -884,8 +873,8 @@ </Configuration>
<Configuration
Name="Release Spanish|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -928,7 +917,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).es.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -963,8 +951,8 @@ </Configuration>
<Configuration
Name="Release Hungarian|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1006,7 +994,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).hu.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1041,8 +1028,8 @@ </Configuration>
<Configuration
Name="Release Hungarian|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1085,7 +1072,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).hu.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1120,8 +1106,8 @@ </Configuration>
<Configuration
Name="Release Korean|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1163,7 +1149,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).kr.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1198,8 +1183,8 @@ </Configuration>
<Configuration
Name="Release Korean|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1242,7 +1227,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).kr.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1277,8 +1261,8 @@ </Configuration>
<Configuration
Name="Release Polish|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1320,7 +1304,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).pl.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1355,8 +1338,8 @@ </Configuration>
<Configuration
Name="Release Polish|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1399,7 +1382,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).pl.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1434,8 +1416,8 @@ </Configuration>
<Configuration
Name="Release Ukrainian|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1477,7 +1459,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ua.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1512,8 +1493,8 @@ </Configuration>
<Configuration
Name="Release Ukrainian|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1556,7 +1537,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ua.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1591,8 +1571,8 @@ </Configuration>
<Configuration
Name="Release Italian|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1634,7 +1614,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).it.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1669,8 +1648,8 @@ </Configuration>
<Configuration
Name="Release Italian|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1713,7 +1692,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).it.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1748,8 +1726,8 @@ </Configuration>
<Configuration
Name="Release Slovak|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1791,7 +1769,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sk.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1826,8 +1803,8 @@ </Configuration>
<Configuration
Name="Release Slovak|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1870,7 +1847,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sk.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1905,8 +1881,8 @@ </Configuration>
<Configuration
Name="Release Chinese simplified|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -1948,7 +1924,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sc.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -1983,8 +1958,8 @@ </Configuration>
<Configuration
Name="Release Chinese simplified|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2027,7 +2002,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sc.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2062,8 +2036,8 @@ </Configuration>
<Configuration
Name="Release Chinese traditional|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2105,7 +2079,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).tc.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2140,8 +2113,8 @@ </Configuration>
<Configuration
Name="Release Chinese traditional|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2184,7 +2157,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).tc.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2219,8 +2191,8 @@ </Configuration>
<Configuration
Name="Release Belarusian|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2262,7 +2234,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).by.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2297,8 +2268,8 @@ </Configuration>
<Configuration
Name="Release Belarusian|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2341,7 +2312,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).by.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2376,8 +2346,8 @@ </Configuration>
<Configuration
Name="Release Swedish|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2419,7 +2389,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sv.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2454,8 +2423,8 @@ </Configuration>
<Configuration
Name="Release Swedish|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2498,7 +2467,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).sv.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2533,8 +2501,8 @@ </Configuration>
<Configuration
Name="Release Portuguese|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2576,7 +2544,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).br.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2611,8 +2578,8 @@ </Configuration>
<Configuration
Name="Release Portuguese|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2655,7 +2622,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).br.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2690,8 +2656,8 @@ </Configuration>
<Configuration
Name="Release Dutch|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2733,7 +2699,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).nl.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2768,8 +2733,8 @@ </Configuration>
<Configuration
Name="Release Dutch|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2812,7 +2777,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).nl.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2847,8 +2811,8 @@ </Configuration>
<Configuration
Name="Release Catalan|Win32"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2890,7 +2854,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ca.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
@@ -2925,8 +2888,8 @@ </Configuration>
<Configuration
Name="Release Catalan|x64"
- OutputDirectory="$(SolutionDir)Release\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)Release\$(PlatformName)\obj\$(ProjectName)\$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
+ IntermediateDirectory="$(SolutionDir)bin\obj\Release_$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops"
CharacterSet="1"
@@ -2969,7 +2932,6 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ca.dll"
- LinkIncremental="1"
SubSystem="2"
LargeAddressAware="2"
OptimizeReferences="2"
diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj index 8adc6149c..87e6a3271 100644 --- a/src/apps/mplayerc/mplayerc.vcproj +++ b/src/apps/mplayerc/mplayerc.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86"
ConfigurationType="1"
InheritedPropertySheets="..\..\common.vsprops;..\..\release.vsprops"
UseOfMFC="1"
@@ -75,7 +75,7 @@ Name="VCLinkerTool"
AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib detours.lib qtmlClient.lib wmstub.lib dxguid.lib Dsound.lib strmbase.lib dsutil.lib subpic.lib subtitles.lib libssf.lib asyncreader.lib audioswitcher.lib avi2ac3filter.lib bufferfilter.lib cddareader.lib cdxareader.lib d2vsource.lib decssfilter.lib flicsource.lib dtsac3source.lib basesource.lib wavdest.lib shoutcastsource.lib streamdrivethru.lib vtsreader.lib basesplitter.lib MatroskaSplitter.lib MatroskaMuxer.lib RealMediaSplitter.lib AviSplitter.lib Mpeg2DecFilter.lib MpaDecFilter.lib RoQSplitter.lib OggSplitter.lib NutSplitter.lib MpegSplitter.lib DiracSplitter.lib MpaSplitter.lib DSMSplitter.lib BaseMuxer.lib DSMMuxer.lib UDPReader.lib FLVSplitter.lib zlib.lib subtitlesource.lib filters.lib libvorbisidec.lib SSFSplitter.lib MP4Splitter.lib libpng.lib Setupapi.lib lgLcd.lib LCDUI.lib MPCVideoDec.lib SyncClock.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
- AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib;$(SolutionDir)lib;$(SolutionDir)lib\wm7;$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib;$(SolutionDir)lib\wm7;$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86"
IgnoreDefaultLibraryNames="MSVCRT"
DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"
SubSystem="2"
@@ -111,7 +111,7 @@ </Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64"
ConfigurationType="1"
InheritedPropertySheets="..\..\common.vsprops;..\..\release.vsprops"
UseOfMFC="1"
@@ -166,7 +166,7 @@ Name="VCLinkerTool"
AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib dxguid.lib Dsound.lib strmbase.lib dsutil.lib subpic.lib subtitles.lib libssf.lib asyncreader.lib audioswitcher.lib avi2ac3filter.lib bufferfilter.lib cddareader.lib cdxareader.lib decssfilter.lib flicsource.lib dtsac3source.lib basesource.lib wavdest.lib shoutcastsource.lib streamdrivethru.lib vtsreader.lib basesplitter.lib MatroskaSplitter.lib MatroskaMuxer.lib RealMediaSplitter.lib AviSplitter.lib MpaDecFilter.lib RoQSplitter.lib OggSplitter.lib NutSplitter.lib MpegSplitter.lib DiracSplitter.lib MpaSplitter.lib DSMSplitter.lib BaseMuxer.lib DSMMuxer.lib UDPReader.lib FLVSplitter.lib zlib.lib subtitlesource.lib filters.lib libvorbisidec.lib SSFSplitter.lib MP4Splitter.lib libpng.lib Setupapi.lib lgLcd.lib LCDUI.lib Uuid.Lib strmiids.lib MPCVideoDec.lib Mpeg2DecFilter.lib detours.lib"
OutputFile="$(OutDir)\$(ProjectName)64.exe"
- AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib;$(SolutionDir)lib64;$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib64;$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64"
IgnoreDefaultLibraryNames=""
DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"
SubSystem="2"
@@ -201,7 +201,7 @@ </Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x86_$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="..\..\common.vsprops;..\..\debug.vsprops"
UseOfMFC="1"
@@ -255,7 +255,7 @@ AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib detours.lib qtmlClient.lib wmstub.lib Dsound.lib dxguid.lib strmbase.lib dsutil.lib subpic.lib subtitles.lib libssf.lib asyncreader.lib audioswitcher.lib avi2ac3filter.lib bufferfilter.lib cddareader.lib cdxareader.lib d2vsource.lib decssfilter.lib flicsource.lib dtsac3source.lib basesource.lib subtitlesource.lib wavdest.lib shoutcastsource.lib streamdrivethru.lib vtsreader.lib basesplitter.lib MatroskaSplitter.lib MatroskaMuxer.lib RealMediaSplitter.lib AviSplitter.lib Mpeg2DecFilter.lib MpaDecFilter.lib RoQSplitter.lib OggSplitter.lib NutSplitter.lib MpegSplitter.lib DiracSplitter.lib MpaSplitter.lib DSMSplitter.lib BaseMuxer.lib DSMMuxer.lib UDPReader.lib FLVSplitter.lib zlib.lib filters.lib libvorbisidec.lib SSFSplitter.lib MP4Splitter.lib libpng.lib Setupapi.lib lgLcd.lib LCDUI.lib MPCVideoDec.lib SyncClock.lib ResizableLib.lib CmdUI.lib sizecbar.lib decss.lib MpcAudioRendererFilter.lib TreePropSheet.lib VTSReader.lib FlacSource.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib;$(SolutionDir)lib\wm7;$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib\wm7;$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86"
IgnoreDefaultLibraryNames="MSVCRTD;LIBCMT"
DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"
SubSystem="2"
@@ -287,7 +287,7 @@ </Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+ OutputDirectory="$(SolutionDir)bin\mpc-hc_x64_$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="..\..\common.vsprops;..\..\debug.vsprops"
UseOfMFC="1"
@@ -339,7 +339,7 @@ Name="VCLinkerTool"
AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib Dsound.lib dxguid.lib strmbase.lib dsutil.lib subpic.lib subtitles.lib libssf.lib asyncreader.lib audioswitcher.lib avi2ac3filter.lib bufferfilter.lib cddareader.lib cdxareader.lib decssfilter.lib flicsource.lib dtsac3source.lib basesource.lib subtitlesource.lib wavdest.lib shoutcastsource.lib streamdrivethru.lib vtsreader.lib basesplitter.lib MatroskaSplitter.lib MatroskaMuxer.lib RealMediaSplitter.lib AviSplitter.lib MpaDecFilter.lib RoQSplitter.lib OggSplitter.lib NutSplitter.lib MpegSplitter.lib DiracSplitter.lib MpaSplitter.lib DSMSplitter.lib BaseMuxer.lib DSMMuxer.lib UDPReader.lib FLVSplitter.lib zlib.lib filters.lib libvorbisidec.lib SSFSplitter.lib MP4Splitter.lib libpng.lib Setupapi.lib lgLcd.lib LCDUI.lib strmiids.lib MPCVideoDec.lib Mpeg2DecFilter.lib detours.lib"
OutputFile="$(OutDir)\$(ProjectName)64.exe"
- AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib;$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64"
IgnoreDefaultLibraryNames="MSVCRTD;LIBCMT"
DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"
SubSystem="2"
diff --git a/src/common.vsprops b/src/common.vsprops index 88dbbd684..416ac067a 100644 --- a/src/common.vsprops +++ b/src/common.vsprops @@ -3,8 +3,8 @@ ProjectType="Visual C++"
Version="8.00"
Name="common"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName)"
+ IntermediateDirectory="$(SolutionDir)bin\obj\$(ConfigurationName)_$(PlatformName)\$(ProjectName)"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj b/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj index 603076564..b2bbab128 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -291,7 +291,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib libssf.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="DSMMuxer.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -323,7 +323,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -366,7 +366,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib libssf.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="DSMMuxer.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -398,7 +398,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -438,7 +438,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib libssf.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DSMMuxer.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -471,7 +471,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -513,7 +513,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib libssf.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DSMMuxer.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcproj b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcproj index 173a08327..53d905954 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcproj +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -290,7 +290,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MatroskaMuxer.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -322,7 +322,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -364,7 +364,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MatroskaMuxer.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -396,7 +396,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -436,7 +436,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MatroskaMuxer.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -469,7 +469,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -511,7 +511,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MatroskaMuxer.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/muxer/WavDest/wavdest.vcproj b/src/filters/muxer/WavDest/wavdest.vcproj index 178461a23..977a3a63f 100644 --- a/src/filters/muxer/WavDest/wavdest.vcproj +++ b/src/filters/muxer/WavDest/wavdest.vcproj @@ -252,7 +252,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -293,7 +293,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="wavdest.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -324,7 +324,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -366,7 +366,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="wavdest.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -397,7 +397,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -437,7 +437,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="wavdest.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -470,7 +470,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -512,7 +512,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="wavdest.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/AviSplitter/AviSplitter.vcproj b/src/filters/parser/AviSplitter/AviSplitter.vcproj index 1fb7d520e..1f24d6e71 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.vcproj +++ b/src/filters/parser/AviSplitter/AviSplitter.vcproj @@ -254,7 +254,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -294,7 +294,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="AviSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -326,7 +326,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -368,7 +368,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="AviSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -400,7 +400,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -441,7 +441,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="AviSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -474,7 +474,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -517,7 +517,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="AviSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.vcproj b/src/filters/parser/DSMSplitter/DSMSplitter.vcproj index 637d11a55..529d48bb2 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.vcproj +++ b/src/filters/parser/DSMSplitter/DSMSplitter.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -291,7 +291,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreDefaultLibraryNames="libc.lib"
ModuleDefinitionFile="DSMSplitter.def"
DelayLoadDLLs=""
@@ -324,7 +324,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -367,7 +367,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreDefaultLibraryNames="libc.lib"
ModuleDefinitionFile="DSMSplitter.def"
DelayLoadDLLs=""
@@ -400,7 +400,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -440,7 +440,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DSMSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -473,7 +473,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -515,7 +515,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DSMSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/DiracSplitter/DiracSplitter.vcproj b/src/filters/parser/DiracSplitter/DiracSplitter.vcproj index b37ca777b..9d3fdb0d4 100644 --- a/src/filters/parser/DiracSplitter/DiracSplitter.vcproj +++ b/src/filters/parser/DiracSplitter/DiracSplitter.vcproj @@ -258,7 +258,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -298,7 +298,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libdirac.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="DiracSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -330,7 +330,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -372,7 +372,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libdirac.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="DiracSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -404,7 +404,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -444,7 +444,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libdirac.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DiracSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -477,7 +477,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -519,7 +519,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libdirac.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DiracSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.vcproj b/src/filters/parser/FLVSplitter/FLVSplitter.vcproj index af8010fbe..2e558674e 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.vcproj +++ b/src/filters/parser/FLVSplitter/FLVSplitter.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -290,7 +290,7 @@ Name="VCLinkerTool"
AdditionalDependencies=" strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreDefaultLibraryNames=""
ModuleDefinitionFile="FLVSplitter.def"
DelayLoadDLLs=""
@@ -323,7 +323,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -365,7 +365,7 @@ Name="VCLinkerTool"
AdditionalDependencies=" strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreDefaultLibraryNames=""
ModuleDefinitionFile="FLVSplitter.def"
DelayLoadDLLs=""
@@ -398,7 +398,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -438,7 +438,7 @@ Name="VCLinkerTool"
AdditionalDependencies=" strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="FLVSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -471,7 +471,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -513,7 +513,7 @@ Name="VCLinkerTool"
AdditionalDependencies=" strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="FLVSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcproj b/src/filters/parser/MP4Splitter/MP4Splitter.vcproj index 21c13c5cb..e345c9699 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.vcproj +++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcproj @@ -255,7 +255,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -296,7 +296,7 @@ Name="VCLinkerTool"
AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreDefaultLibraryNames="libc.lib"
ModuleDefinitionFile="MP4Splitter.def"
DelayLoadDLLs=""
@@ -329,7 +329,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -372,7 +372,7 @@ Name="VCLinkerTool"
AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreDefaultLibraryNames="libc.lib"
ModuleDefinitionFile="MP4Splitter.def"
DelayLoadDLLs=""
@@ -405,7 +405,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -446,7 +446,7 @@ Name="VCLinkerTool"
AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MP4Splitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -479,7 +479,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -522,7 +522,7 @@ Name="VCLinkerTool"
AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MP4Splitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcproj b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcproj index 6d5f594a7..bc6100dc6 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcproj +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -290,7 +290,7 @@ Name="VCLinkerTool"
AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MatroskaSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -322,7 +322,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -364,7 +364,7 @@ Name="VCLinkerTool"
AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MatroskaSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -396,7 +396,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -436,7 +436,7 @@ Name="VCLinkerTool"
AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MatroskaSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -469,7 +469,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -511,7 +511,7 @@ Name="VCLinkerTool"
AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MatroskaSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.vcproj b/src/filters/parser/MpaSplitter/MpaSplitter.vcproj index 6774bfbd7..7598723c9 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitter.vcproj +++ b/src/filters/parser/MpaSplitter/MpaSplitter.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -290,7 +290,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MpaSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -322,7 +322,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -364,7 +364,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MpaSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -396,7 +396,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -436,7 +436,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MpaSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -469,7 +469,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -511,7 +511,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MpaSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.vcproj b/src/filters/parser/MpegSplitter/MpegSplitter.vcproj index 5e30da9d7..11b9efa9d 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.vcproj +++ b/src/filters/parser/MpegSplitter/MpegSplitter.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -290,7 +290,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MpegSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -322,7 +322,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -364,7 +364,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MpegSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -396,7 +396,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -436,7 +436,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MpegSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -469,7 +469,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -511,7 +511,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MpegSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/NutSplitter/NutSplitter.vcproj b/src/filters/parser/NutSplitter/NutSplitter.vcproj index 453b3af71..ef77c9dcf 100644 --- a/src/filters/parser/NutSplitter/NutSplitter.vcproj +++ b/src/filters/parser/NutSplitter/NutSplitter.vcproj @@ -251,7 +251,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -291,7 +291,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="NutSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -323,7 +323,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -365,7 +365,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="NutSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -397,7 +397,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -437,7 +437,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="NutSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -470,7 +470,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -512,7 +512,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="NutSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/OggSplitter/OggSplitter.vcproj b/src/filters/parser/OggSplitter/OggSplitter.vcproj index 6240ae851..ca22f7469 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.vcproj +++ b/src/filters/parser/OggSplitter/OggSplitter.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -290,7 +290,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="OggSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -322,7 +322,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -364,7 +364,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="OggSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -396,7 +396,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -436,7 +436,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="OggSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -469,7 +469,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -511,7 +511,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="OggSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcproj b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcproj index 098149013..b4223b8ae 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcproj +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcproj @@ -260,7 +260,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -300,7 +300,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreDefaultLibraryNames="libc.lib"
ModuleDefinitionFile="RealMediaSplitter.def"
DelayLoadDLLs=""
@@ -333,7 +333,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -375,7 +375,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreDefaultLibraryNames="libc.lib"
ModuleDefinitionFile="RealMediaSplitter.def"
DelayLoadDLLs=""
@@ -408,7 +408,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -448,7 +448,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="RealMediaSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -481,7 +481,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -523,7 +523,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="RealMediaSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/RoQSplitter/RoQSplitter.vcproj b/src/filters/parser/RoQSplitter/RoQSplitter.vcproj index ba1d18a3a..67e4af626 100644 --- a/src/filters/parser/RoQSplitter/RoQSplitter.vcproj +++ b/src/filters/parser/RoQSplitter/RoQSplitter.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -291,7 +291,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="RoQSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -323,7 +323,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -366,7 +366,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="RoQSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -398,7 +398,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -439,7 +439,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="RoQSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -472,7 +472,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -515,7 +515,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="RoQSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.vcproj b/src/filters/parser/SSFSplitter/SSFSplitter.vcproj index 702ce072e..edf487c3d 100644 --- a/src/filters/parser/SSFSplitter/SSFSplitter.vcproj +++ b/src/filters/parser/SSFSplitter/SSFSplitter.vcproj @@ -250,7 +250,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -290,7 +290,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libssf.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="SSFSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -322,7 +322,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -364,7 +364,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libssf.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="SSFSplitter.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -396,7 +396,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -436,7 +436,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libssf.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="SSFSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -469,7 +469,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -511,7 +511,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libssf.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="SSFSplitter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/parser/StreamDriveThru/streamdrivethru.vcproj b/src/filters/parser/StreamDriveThru/streamdrivethru.vcproj index 539a64361..6b683cb37 100644 --- a/src/filters/parser/StreamDriveThru/streamdrivethru.vcproj +++ b/src/filters/parser/StreamDriveThru/streamdrivethru.vcproj @@ -252,7 +252,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -292,7 +292,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="StreamDriveThru.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -324,7 +324,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -366,7 +366,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="StreamDriveThru.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -398,7 +398,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -438,7 +438,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="StreamDriveThru.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -471,7 +471,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -513,7 +513,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="StreamDriveThru.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/reader/CDDAReader/cddareader.vcproj b/src/filters/reader/CDDAReader/cddareader.vcproj index eb31e0e13..95aaa36a7 100644 --- a/src/filters/reader/CDDAReader/cddareader.vcproj +++ b/src/filters/reader/CDDAReader/cddareader.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="CDDAReader.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="CDDAReader.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="CDDAReader.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="CDDAReader.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/reader/CDXAReader/cdxareader.vcproj b/src/filters/reader/CDXAReader/cdxareader.vcproj index 029c4fee4..56ec09dce 100644 --- a/src/filters/reader/CDXAReader/cdxareader.vcproj +++ b/src/filters/reader/CDXAReader/cdxareader.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="CDXAReader.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="CDXAReader.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="CDXAReader.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="CDXAReader.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/reader/UDPReader/UDPReader.vcproj b/src/filters/reader/UDPReader/UDPReader.vcproj index 28b2b386e..cab72442f 100644 --- a/src/filters/reader/UDPReader/UDPReader.vcproj +++ b/src/filters/reader/UDPReader/UDPReader.vcproj @@ -254,7 +254,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -295,7 +295,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="UDPReader.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -326,7 +326,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -353,7 +353,6 @@ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"
- UsePrecompiledHeader="2"
DebugInformationFormat="3"
/>
<Tool
@@ -369,7 +368,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="UDPReader.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -400,7 +399,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -441,7 +440,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="UDPReader.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -474,7 +473,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -517,7 +516,7 @@ Name="VCLinkerTool"
AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="UDPReader.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/reader/VTSReader/vtsreader.vcproj b/src/filters/reader/VTSReader/vtsreader.vcproj index a5415f060..e713c85dc 100644 --- a/src/filters/reader/VTSReader/vtsreader.vcproj +++ b/src/filters/reader/VTSReader/vtsreader.vcproj @@ -252,7 +252,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -292,7 +292,7 @@ Name="VCLinkerTool"
AdditionalDependencies="decss.lib asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="VTSReader.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -323,7 +323,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -365,7 +365,7 @@ Name="VCLinkerTool"
AdditionalDependencies="decss.lib asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="VTSReader.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -396,7 +396,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -436,7 +436,7 @@ Name="VCLinkerTool"
AdditionalDependencies="decss.lib asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="VTSReader.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -469,7 +469,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -511,7 +511,7 @@ Name="VCLinkerTool"
AdditionalDependencies="decss.lib asyncreader.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="VTSReader.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/reader/asyncreader/asyncio.cpp b/src/filters/reader/asyncreader/asyncio.cpp index 3f6494a6f..5675d22f2 100644 --- a/src/filters/reader/asyncreader/asyncio.cpp +++ b/src/filters/reader/asyncreader/asyncio.cpp @@ -3,7 +3,7 @@ //
// Desc: DirectShow sample code - base library with I/O functionality.
//
-// Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
//------------------------------------------------------------------------------
@@ -28,8 +28,8 @@ CAsyncRequest::Request( LONG lLength,
BOOL bAligned,
BYTE* pBuffer,
- LPVOID pContext, // filter's context
- DWORD dwUser) // downstream filter's context
+ LPVOID pContext, // filter's context
+ DWORD_PTR dwUser) // downstream filter's context
{
m_pIo = pIo;
m_pStream = pStream;
@@ -55,25 +55,32 @@ CAsyncRequest::Complete() m_pStream->Lock();
m_hr = m_pStream->SetPointer(m_llPos);
- if (S_OK == m_hr) {
-
+ if(S_OK == m_hr)
+ {
DWORD dwActual;
m_hr = m_pStream->Read(m_pBuffer, m_lLength, m_bAligned, &dwActual);
- if (m_hr == OLE_S_FIRST) {
- if (m_pContext) {
+ if(m_hr == OLE_S_FIRST)
+ {
+ if(m_pContext)
+ {
IMediaSample *pSample = reinterpret_cast<IMediaSample *>(m_pContext);
pSample->SetDiscontinuity(TRUE);
m_hr = S_OK;
}
}
- if (FAILED(m_hr)) {
- } else if (dwActual != (DWORD)m_lLength) {
+ if(FAILED(m_hr))
+ {
+ }
+ else if(dwActual != (DWORD)m_lLength)
+ {
// tell caller size changed - probably because of EOF
m_lLength = (LONG) dwActual;
m_hr = S_FALSE;
- } else {
+ }
+ else
+ {
m_hr = S_OK;
}
}
@@ -83,22 +90,21 @@ CAsyncRequest::Complete() }
-
// --- CAsyncIo ---
// note - all events created manual reset
CAsyncIo::CAsyncIo(CAsyncStream *pStream)
- : m_hThread(NULL),
- m_evWork(TRUE),
- m_evDone(TRUE),
- m_evStop(TRUE),
- m_listWork(NAME("Work list")),
- m_listDone(NAME("Done list")),
- m_bFlushing(FALSE),
- m_cItemsOut(0),
- m_bWaiting(FALSE),
- m_pStream(pStream)
+ : m_hThread(NULL),
+ m_evWork(TRUE),
+ m_evDone(TRUE),
+ m_evStop(TRUE),
+ m_listWork(NAME("Work list")),
+ m_listDone(NAME("Done list")),
+ m_bFlushing(FALSE),
+ m_cItemsOut(0),
+ m_bWaiting(FALSE),
+ m_pStream(pStream)
{
}
@@ -114,13 +120,16 @@ CAsyncIo::~CAsyncIo() // empty the done list
POSITION pos = m_listDone.GetHeadPosition();
- while (pos) {
+ while(pos)
+ {
CAsyncRequest* pRequest = m_listDone.GetNext(pos);
delete pRequest;
}
+
m_listDone.RemoveAll();
}
+
// ready for async activity - call this before calling Request.
//
// start the worker thread if we need to
@@ -146,40 +155,46 @@ CAsyncIo::AsyncInactive(void) // add a request to the queue.
HRESULT
CAsyncIo::Request(
- LONGLONG llPos,
- LONG lLength,
- BOOL bAligned,
- BYTE* pBuffer,
- LPVOID pContext,
- DWORD dwUser)
+ LONGLONG llPos,
+ LONG lLength,
+ BOOL bAligned,
+ BYTE * pBuffer,
+ LPVOID pContext,
+ DWORD_PTR dwUser)
{
- if (bAligned) {
- if (!IsAligned(llPos) ||
- !IsAligned(lLength) ||
- !IsAligned((LONG) pBuffer)) {
+ if(bAligned)
+ {
+ if(!IsAligned(llPos) ||
+ !IsAligned(lLength) ||
+ !IsAligned((LONG_PTR) pBuffer))
+ {
return VFW_E_BADALIGN;
}
}
- CAsyncRequest* pRequest = DNew CAsyncRequest;
+ CAsyncRequest* pRequest = new CAsyncRequest;
+ if (!pRequest)
+ return E_OUTOFMEMORY;
- HRESULT hr = pRequest->Request(
- this,
- m_pStream,
- llPos,
- lLength,
- bAligned,
- pBuffer,
- pContext,
- dwUser);
- if (SUCCEEDED(hr)) {
+ HRESULT hr = pRequest->Request(this,
+ m_pStream,
+ llPos,
+ lLength,
+ bAligned,
+ pBuffer,
+ pContext,
+ dwUser);
+ if(SUCCEEDED(hr))
+ {
// might fail if flushing
hr = PutWorkItem(pRequest);
}
- if (FAILED(hr)) {
+ if(FAILED(hr))
+ {
delete pRequest;
}
+
return hr;
}
@@ -188,38 +203,47 @@ CAsyncIo::Request( HRESULT
CAsyncIo::WaitForNext(
DWORD dwTimeout,
- LPVOID *ppContext,
- DWORD * pdwUser,
- LONG* pcbActual)
+ LPVOID * ppContext,
+ DWORD_PTR * pdwUser,
+ LONG * pcbActual)
{
+ CheckPointer(ppContext,E_POINTER);
+ CheckPointer(pdwUser,E_POINTER);
+ CheckPointer(pcbActual,E_POINTER);
+
// some errors find a sample, others don't. Ensure that
// *ppContext is NULL if no sample found
*ppContext = NULL;
// wait until the event is set, but since we are not
// holding the critsec when waiting, we may need to re-wait
- for (;;) {
-
- if (!m_evDone.Wait(dwTimeout)) {
+ for(;;)
+ {
+ if(!m_evDone.Wait(dwTimeout))
+ {
// timeout occurred
return VFW_E_TIMEOUT;
}
// get next event from list
CAsyncRequest* pRequest = GetDoneItem();
- if (pRequest) {
+ if(pRequest)
+ {
// found a completed request
// check if ok
HRESULT hr = pRequest->GetHResult();
- if (hr == S_FALSE) {
-
+ if(hr == S_FALSE)
+ {
// this means the actual length was less than
// requested - may be ok if he aligned the end of file
- if ((pRequest->GetActualLength() +
- pRequest->GetStart()) == Size()) {
+ if((pRequest->GetActualLength() +
+ pRequest->GetStart()) == Size())
+ {
hr = S_OK;
- } else {
+ }
+ else
+ {
// it was an actual read error
hr = E_FAIL;
}
@@ -234,11 +258,13 @@ CAsyncIo::WaitForNext( delete pRequest;
return hr;
- } else {
+ }
+ else
+ {
// Hold the critical section while checking the list state
CAutoLock lck(&m_csLists);
- if (m_bFlushing && !m_bWaiting) {
-
+ if(m_bFlushing && !m_bWaiting)
+ {
// can't block as we are between BeginFlush and EndFlush
// but note that if m_bWaiting is set, then there are some
@@ -253,38 +279,38 @@ CAsyncIo::WaitForNext( }
}
+
// perform a synchronous read request on this thread.
// Need to hold m_csFile while doing this (done in request object)
HRESULT
CAsyncIo::SyncReadAligned(
- LONGLONG llPos,
- LONG lLength,
- BYTE* pBuffer,
- LONG* pcbActual,
- PVOID pvContext
- )
+ LONGLONG llPos,
+ LONG lLength,
+ BYTE * pBuffer,
+ LONG * pcbActual,
+ PVOID pvContext)
{
- if (!IsAligned(llPos) ||
- !IsAligned(lLength) ||
- !IsAligned((LONG) pBuffer)) {
+ CheckPointer(pcbActual,E_POINTER);
+
+ if(!IsAligned(llPos) ||
+ !IsAligned(lLength) ||
+ !IsAligned((LONG_PTR) pBuffer))
+ {
return VFW_E_BADALIGN;
}
CAsyncRequest request;
- HRESULT hr = request.Request(
- this,
- m_pStream,
- llPos,
- lLength,
- TRUE,
- pBuffer,
- pvContext,
- 0);
-
- if (FAILED(hr)) {
+ HRESULT hr = request.Request(this,
+ m_pStream,
+ llPos,
+ lLength,
+ TRUE,
+ pBuffer,
+ pvContext,
+ 0);
+ if(FAILED(hr))
return hr;
- }
hr = request.Complete();
@@ -293,13 +319,17 @@ CAsyncIo::SyncReadAligned( return hr;
}
+
HRESULT
-CAsyncIo::Length(LONGLONG *pllTotal, LONGLONG* pllAvailable)
+CAsyncIo::Length(LONGLONG *pllTotal, LONGLONG *pllAvailable)
{
+ CheckPointer(pllTotal,E_POINTER);
+
*pllTotal = m_pStream->Size(pllAvailable);
return S_OK;
}
+
// cancel all items on the worklist onto the done list
// and refuse further requests or further WaitForNext calls
// until the end flush
@@ -329,14 +359,15 @@ CAsyncIo::BeginFlush() m_bFlushing = TRUE;
CAsyncRequest * preq;
- while((preq = GetWorkItem()) != 0) {
+ while((preq = GetWorkItem()) != 0)
+ {
preq->Cancel();
PutDoneItem(preq);
}
// now wait for any outstanding requests to complete
- if (m_cItemsOut > 0) {
-
+ if(m_cItemsOut > 0)
+ {
// can be only one person waiting
ASSERT(!m_bWaiting);
@@ -344,7 +375,9 @@ CAsyncIo::BeginFlush() // signalled via m_evAllDone when all outstanding items are
// done. It also tells WaitForNext to continue blocking.
m_bWaiting = TRUE;
- } else {
+ }
+ else
+ {
// all done
// force m_evDone set so that even if list is empty,
@@ -359,14 +392,15 @@ CAsyncIo::BeginFlush() ASSERT(m_bWaiting);
// wait without holding critsec
- for (;;) {
+ for(;;)
+ {
m_evAllDone.Wait();
{
// hold critsec to check
CAutoLock lock(&m_csLists);
- if (m_cItemsOut == 0) {
-
+ if(m_cItemsOut == 0)
+ {
// now we are sure that all outstanding requests are on
// the done list and no more will be accepted
m_bWaiting = FALSE;
@@ -383,6 +417,7 @@ CAsyncIo::BeginFlush() }
}
+
// end a flushing state
HRESULT
CAsyncIo::EndFlush()
@@ -395,20 +430,25 @@ CAsyncIo::EndFlush() // m_evDone might have been set by BeginFlush - ensure it is
// set IFF m_listDone is non-empty
- if (m_listDone.GetCount() > 0) {
+ if(m_listDone.GetCount() > 0)
+ {
m_evDone.Set();
- } else {
+ }
+ else
+ {
m_evDone.Reset();
}
return S_OK;
}
+
// start the thread
HRESULT
CAsyncIo::StartThread(void)
{
- if (m_hThread) {
+ if(m_hThread)
+ {
return S_OK;
}
@@ -416,20 +456,22 @@ CAsyncIo::StartThread(void) m_evStop.Reset();
DWORD dwThreadID;
- m_hThread = CreateThread(
- NULL,
- 0,
- InitialThreadProc,
- this,
- 0,
- &dwThreadID);
- if (!m_hThread) {
- DWORD dwErr = GetLastError();
+ m_hThread = CreateThread(NULL,
+ 0,
+ InitialThreadProc,
+ this,
+ 0,
+ &dwThreadID);
+ if(!m_hThread)
+ {
+ DWORD dwErr = GetLastError();
return HRESULT_FROM_WIN32(dwErr);
}
+
return S_OK;
}
+
// stop the thread and close the handle
HRESULT
CAsyncIo::CloseThread(void)
@@ -437,12 +479,13 @@ CAsyncIo::CloseThread(void) // signal the thread-exit object
m_evStop.Set();
- if (m_hThread) {
-
+ if(m_hThread)
+ {
WaitForSingleObject(m_hThread, INFINITE);
CloseHandle(m_hThread);
m_hThread = NULL;
}
+
return S_OK;
}
@@ -455,22 +498,23 @@ CAsyncRequest* CAsyncIo::GetWorkItem()
{
CAutoLock lck(&m_csLists);
-
CAsyncRequest * preq = m_listWork.RemoveHead();
// force event set correctly
- if (m_listWork.GetCount() == 0) {
+ if(m_listWork.GetCount() == 0)
+ {
m_evWork.Reset();
}
+
return preq;
}
+
// get an item from the done list
CAsyncRequest*
CAsyncIo::GetDoneItem()
{
CAutoLock lock(&m_csLists);
-
CAsyncRequest * preq = m_listDone.RemoveHead();
// force event set correctly if list now empty
@@ -483,14 +527,16 @@ CAsyncIo::GetDoneItem() // has moved to the done list which means we must wait until
// cItemsOut is 0 (which is guaranteed by m_bWaiting being TRUE).
- if (m_listDone.GetCount() == 0 &&
- (!m_bFlushing || m_bWaiting)) {
+ if(m_listDone.GetCount() == 0 &&
+ (!m_bFlushing || m_bWaiting))
+ {
m_evDone.Reset();
}
return preq;
}
+
// put an item on the work list - fail if bFlushing
HRESULT
CAsyncIo::PutWorkItem(CAsyncRequest* pRequest)
@@ -498,24 +544,28 @@ CAsyncIo::PutWorkItem(CAsyncRequest* pRequest) CAutoLock lock(&m_csLists);
HRESULT hr;
- if (m_bFlushing) {
+ if(m_bFlushing)
+ {
hr = VFW_E_WRONG_STATE;
}
- else if (m_listWork.AddTail(pRequest)) {
-
+ else if(m_listWork.AddTail(pRequest))
+ {
// event should now be in a set state - force this
m_evWork.Set();
// start the thread now if not already started
hr = StartThread();
- } else {
+ }
+ else
+ {
hr = E_OUTOFMEMORY;
}
return(hr);
}
+
// put an item on the done list - ok to do this when
// flushing
HRESULT
@@ -523,28 +573,34 @@ CAsyncIo::PutDoneItem(CAsyncRequest* pRequest) {
ASSERT(CritCheckIn(&m_csLists));
- if (m_listDone.AddTail(pRequest)) {
-
+ if(m_listDone.AddTail(pRequest))
+ {
// event should now be in a set state - force this
m_evDone.Set();
return S_OK;
- } else {
+ }
+ else
+ {
return E_OUTOFMEMORY;
}
}
+
// called on thread to process any active requests
void
CAsyncIo::ProcessRequests(void)
{
// lock to get the item and increment the outstanding count
CAsyncRequest * preq = NULL;
- for (;;) {
+
+ for(;;)
+ {
{
CAutoLock lock(&m_csLists);
preq = GetWorkItem();
- if (preq == NULL) {
+ if(preq == NULL)
+ {
// done
return;
}
@@ -563,15 +619,16 @@ CAsyncIo::ProcessRequests(void) PutDoneItem(preq);
- if (--m_cItemsOut == 0) {
- if (m_bWaiting) {
+ if(--m_cItemsOut == 0)
+ {
+ if(m_bWaiting)
m_evAllDone.Set();
- }
}
}
}
}
+
// the thread proc - assumes that DWORD thread param is the
// this pointer
DWORD
@@ -579,38 +636,40 @@ CAsyncIo::ThreadProc(void) {
HANDLE ahev[] = {m_evStop, m_evWork};
- for (;;) {
- DWORD dw = WaitForMultipleObjects(
- 2,
- ahev,
- FALSE,
- INFINITE);
- if (dw == WAIT_OBJECT_0+1) {
-
- // requests need processing
- ProcessRequests();
- } else {
- // any error or stop event - we should exit
- return 0;
- }
+ for(;;)
+ {
+ DWORD dw = WaitForMultipleObjects(2,
+ ahev,
+ FALSE,
+ INFINITE);
+ if(dw == WAIT_OBJECT_0+1)
+ {
+ // requests need processing
+ ProcessRequests();
+ }
+ else
+ {
+ // any error or stop event - we should exit
+ return 0;
+ }
}
}
-
// perform a synchronous read request on this thread.
// may not be aligned - so we will have to buffer.
HRESULT
CAsyncIo::SyncRead(
- LONGLONG llPos,
- LONG lLength,
- BYTE* pBuffer)
+ LONGLONG llPos,
+ LONG lLength,
+ BYTE * pBuffer)
{
- if (IsAligned(llPos) &&
- IsAligned(lLength) &&
- IsAligned((LONG) pBuffer)) {
+ if(IsAligned(llPos) &&
+ IsAligned(lLength) &&
+ IsAligned((LONG_PTR) pBuffer))
+ {
LONG cbUnused;
- return SyncReadAligned(llPos, lLength, pBuffer, &cbUnused, NULL);
+ return SyncReadAligned(llPos, lLength, pBuffer, &cbUnused, NULL);
}
// not aligned with requirements - use buffered file handle.
@@ -618,27 +677,32 @@ CAsyncIo::SyncRead( CAsyncRequest request;
- HRESULT hr = request.Request(
- this,
- m_pStream,
- llPos,
- lLength,
- FALSE,
- pBuffer,
- NULL,
- 0);
-
- if (FAILED(hr)) {
+ HRESULT hr = request.Request(this,
+ m_pStream,
+ llPos,
+ lLength,
+ FALSE,
+ pBuffer,
+ NULL,
+ 0);
+
+ if(FAILED(hr))
+ {
return hr;
}
return request.Complete();
}
+
// Return the alignment
HRESULT
-CAsyncIo::Alignment(LONG *pl)
+CAsyncIo::Alignment(LONG *pAlignment)
{
- *pl = Alignment();
+ CheckPointer(pAlignment,E_POINTER);
+
+ *pAlignment = Alignment();
return S_OK;
}
+
+
diff --git a/src/filters/reader/asyncreader/asyncio.h b/src/filters/reader/asyncreader/asyncio.h index 0f463bf7a..25ebcff35 100644 --- a/src/filters/reader/asyncreader/asyncio.h +++ b/src/filters/reader/asyncreader/asyncio.h @@ -3,7 +3,7 @@ //
// Desc: DirectShow sample code - base library for I/O functionality.
//
-// Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
//------------------------------------------------------------------------------
#pragma once
@@ -16,6 +16,7 @@ // !!! Need to use real overlapped i/o if available
// currently only uses worker thread, not overlapped i/o
+
class CAsyncIo;
class CAsyncStream;
@@ -31,6 +32,7 @@ public: DWORD dwBytesToRead,
BOOL bAlign,
LPDWORD pdwBytesRead) = 0;
+
virtual LONGLONG Size(LONGLONG *pSizeAvailable = NULL) = 0;
virtual DWORD Alignment() = 0;
virtual void Lock() = 0;
@@ -43,28 +45,28 @@ public: // (ie across SetFilePointer/ReadFile pairs)
class CAsyncRequest
{
- CAsyncIo *m_pIo;
+ CAsyncIo *m_pIo;
CAsyncStream *m_pStream;
LONGLONG m_llPos;
- BOOL m_bAligned;
- LONG m_lLength;
- BYTE* m_pBuffer;
- LPVOID m_pContext;
- DWORD m_dwUser;
+ BOOL m_bAligned;
+ LONG m_lLength;
+ BYTE* m_pBuffer;
+ LPVOID m_pContext;
+ DWORD_PTR m_dwUser;
HRESULT m_hr;
public:
// init the params for this request. Issue the i/o
// if overlapped i/o is possible.
HRESULT Request(
- CAsyncIo *pIo,
+ CAsyncIo *pIo,
CAsyncStream *pStream,
- LONGLONG llPos,
- LONG lLength,
+ LONGLONG llPos,
+ LONG lLength,
BOOL bAligned,
- BYTE* pBuffer,
- LPVOID pContext, // filter's context
- DWORD dwUser); // downstream filter's context
+ BYTE* pBuffer,
+ LPVOID pContext, // filter's context
+ DWORD_PTR dwUser); // downstream filter's context
// issue the i/o if not overlapped, and block until i/o complete.
// returns error code of file i/o
@@ -73,18 +75,18 @@ public: // cancels the i/o. blocks until i/o is no longer pending
HRESULT Cancel() const
{
- return S_OK;
+ return S_OK;
};
// accessor functions
LPVOID GetContext() /*const*/
{
- return m_pContext;
+ return m_pContext;
};
DWORD GetUser() const
{
- return m_dwUser;
+ return m_dwUser;
};
HRESULT GetHResult() const {
@@ -134,9 +136,11 @@ class CAsyncIo CCritSec m_csLists; // locks access to the list and events
BOOL m_bFlushing; // true if between BeginFlush/EndFlush
+
CRequestList m_listWork;
CRequestList m_listDone;
- CAMEvent m_evWork; // set when list is not empty
+
+ CAMEvent m_evWork; // set when list is not empty
CAMEvent m_evDone;
// for correct flush behaviour: all protected by m_csLists
@@ -180,8 +184,8 @@ class CAsyncIo // initial static thread proc calls ThreadProc with DWORD
// param as this
static DWORD WINAPI InitialThreadProc(LPVOID pv) {
- CAsyncIo * pThis = static_cast<CAsyncIo*> (pv);
- return pThis->ThreadProc();
+ CAsyncIo * pThis = static_cast<CAsyncIo*> (pv);
+ return pThis->ThreadProc();
};
DWORD ThreadProc(void);
@@ -204,36 +208,34 @@ public: // queue a requested read. must be aligned.
HRESULT Request(
- LONGLONG llPos,
- LONG lLength,
- BOOL bAligned,
- BYTE* pBuffer,
- LPVOID pContext,
- DWORD dwUser);
+ LONGLONG llPos,
+ LONG lLength,
+ BOOL bAligned,
+ BYTE* pBuffer,
+ LPVOID pContext,
+ DWORD_PTR dwUser);
// wait for the next read to complete
HRESULT WaitForNext(
- DWORD dwTimeout,
- LPVOID *ppContext,
- DWORD * pdwUser,
- LONG * pcbActual
- );
+ DWORD dwTimeout,
+ LPVOID *ppContext,
+ DWORD_PTR * pdwUser,
+ LONG * pcbActual);
// perform a read of an already aligned buffer
HRESULT SyncReadAligned(
- LONGLONG llPos,
- LONG lLength,
- BYTE* pBuffer,
- LONG* pcbActual,
- PVOID pvContext
- );
+ LONGLONG llPos,
+ LONG lLength,
+ BYTE* pBuffer,
+ LONG* pcbActual,
+ PVOID pvContext);
// perform a synchronous read. will be buffered
// if not aligned.
HRESULT SyncRead(
- LONGLONG llPos,
- LONG lLength,
- BYTE* pBuffer);
+ LONGLONG llPos,
+ LONG lLength,
+ BYTE* pBuffer);
// return length
HRESULT Length(LONGLONG *pllTotal, LONGLONG* pllAvailable);
@@ -250,17 +252,24 @@ public: return m_pStream->Alignment();
};
- BOOL IsAligned(LONG l) {
- if ((l & (Alignment() -1)) == 0) {
- return TRUE;
- } else {
- return FALSE;
- }
+ BOOL IsAligned(LONG_PTR l)
+ {
+ // LONG_PTR is long on 32-bit or __int64 on 64-bit.
+ if ( (static_cast<LONG>(l & 0xffffffff) & (Alignment() -1)) == 0 )
+ {
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
};
+#ifndef _WIN64
BOOL IsAligned(LONGLONG ll) {
- return IsAligned( (LONG) (ll & 0xffffffff));
+ return IsAligned( (LONG) (ll & 0xffffffff));
};
+#endif
// Accessor
HANDLE StopEvent() const { return m_evDone; }
diff --git a/src/filters/reader/asyncreader/asyncrdr.cpp b/src/filters/reader/asyncreader/asyncrdr.cpp index 5e807f8cc..5fa17ba93 100644 --- a/src/filters/reader/asyncreader/asyncrdr.cpp +++ b/src/filters/reader/asyncreader/asyncrdr.cpp @@ -5,7 +5,7 @@ // This file implements I/O source filter methods and output pin
// methods for CAsyncReader and CAsyncOutputPin.
//
-// Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
//------------------------------------------------------------------------------
@@ -21,12 +21,12 @@ CAsyncOutputPin::CAsyncOutputPin( CAsyncIo *pIo,
CCritSec * pLock)
: CBasePin(
- NAME("Async output pin"),
- pReader,
- pLock,
- phr,
- L"Output",
- PINDIR_OUTPUT),
+ NAME("Async output pin"),
+ pReader,
+ pLock,
+ phr,
+ L"Output",
+ PINDIR_OUTPUT),
m_pReader(pReader),
m_pIo(pIo)
{
@@ -36,97 +36,123 @@ CAsyncOutputPin::~CAsyncOutputPin() {
}
-STDMETHODIMP
-CAsyncOutputPin::NonDelegatingQueryInterface(REFIID riid, void** ppv)
+
+STDMETHODIMP CAsyncOutputPin::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
CheckPointer(ppv,E_POINTER);
- if (riid == IID_IAsyncReader) {
+ if(riid == IID_IAsyncReader)
+ {
m_bQueriedForAsyncReader = TRUE;
- return GetInterface((IAsyncReader*) this, ppv);
- } else {
- return CBasePin::NonDelegatingQueryInterface(riid, ppv);
+ return GetInterface((IAsyncReader*) this, ppv);
+ }
+ else
+ {
+ return CBasePin::NonDelegatingQueryInterface(riid, ppv);
}
}
-HRESULT
-CAsyncOutputPin::GetMediaType(int iPosition, CMediaType *pMediaType)
+
+HRESULT CAsyncOutputPin::GetMediaType(int iPosition, CMediaType *pMediaType)
{
- if (iPosition < 0) {
- return E_INVALIDARG;
+ if(iPosition < 0)
+ {
+ return E_INVALIDARG;
}
- if (iPosition > 0) {
- return VFW_S_NO_MORE_ITEMS;
+ if(iPosition > 0)
+ {
+ return VFW_S_NO_MORE_ITEMS;
}
+ CheckPointer(pMediaType,E_POINTER);
+ CheckPointer(m_pReader,E_UNEXPECTED);
+
*pMediaType = *m_pReader->LoadType();
+
return S_OK;
}
-HRESULT
-CAsyncOutputPin::CheckMediaType(const CMediaType* pType)
+
+HRESULT CAsyncOutputPin::CheckMediaType(const CMediaType* pType)
{
CAutoLock lck(m_pLock);
/* We treat MEDIASUBTYPE_NULL subtype as a wild card */
- if ((m_pReader->LoadType()->majortype == pType->majortype) &&
- (m_pReader->LoadType()->subtype == MEDIASUBTYPE_NULL ||
- m_pReader->LoadType()->subtype == pType->subtype)) {
- return S_OK;
+ if((m_pReader->LoadType()->majortype == pType->majortype) &&
+ (m_pReader->LoadType()->subtype == MEDIASUBTYPE_NULL ||
+ m_pReader->LoadType()->subtype == pType->subtype))
+ {
+ return S_OK;
}
+
return S_FALSE;
}
-HRESULT
-CAsyncOutputPin::InitAllocator(IMemAllocator **ppAlloc)
+
+HRESULT CAsyncOutputPin::InitAllocator(IMemAllocator **ppAlloc)
{
+ CheckPointer(ppAlloc,E_POINTER);
+
HRESULT hr = NOERROR;
- *ppAlloc = NULL;
CMemAllocator *pMemObject = NULL;
+ *ppAlloc = NULL;
+
/* Create a default memory allocator */
- pMemObject = DNew CMemAllocator(NAME("Base memory allocator"),NULL, &hr);
- if (pMemObject == NULL) {
- return E_OUTOFMEMORY;
+ pMemObject = new CMemAllocator(NAME("Base memory allocator"), NULL, &hr);
+ if(pMemObject == NULL)
+ {
+ return E_OUTOFMEMORY;
}
-
- if (FAILED(hr)) {
- delete pMemObject;
- return hr;
+ if(FAILED(hr))
+ {
+ delete pMemObject;
+ return hr;
}
/* Get a reference counted IID_IMemAllocator interface */
hr = pMemObject->QueryInterface(IID_IMemAllocator,(void **)ppAlloc);
- if (FAILED(hr)) {
- delete pMemObject;
- return E_NOINTERFACE;
+ if(FAILED(hr))
+ {
+ delete pMemObject;
+ return E_NOINTERFACE;
}
ASSERT(*ppAlloc != NULL);
return NOERROR;
}
+
// we need to return an addrefed allocator, even if it is the preferred
// one, since he doesn't know whether it is the preferred one or not.
-STDMETHODIMP
+STDMETHODIMP
CAsyncOutputPin::RequestAllocator(
IMemAllocator* pPreferred,
ALLOCATOR_PROPERTIES* pProps,
IMemAllocator ** ppActual)
{
+ CheckPointer(pPreferred,E_POINTER);
+ CheckPointer(pProps,E_POINTER);
+ CheckPointer(ppActual,E_POINTER);
+ ASSERT(m_pIo);
+
// we care about alignment but nothing else
- if (!pProps->cbAlign || !m_pIo->IsAligned(pProps->cbAlign)) {
- m_pIo->Alignment(&pProps->cbAlign);
+ if(!pProps->cbAlign || !m_pIo->IsAligned(pProps->cbAlign))
+ {
+ m_pIo->Alignment(&pProps->cbAlign);
}
ALLOCATOR_PROPERTIES Actual;
HRESULT hr;
- if (pPreferred) {
- hr = pPreferred->SetProperties(pProps, &Actual);
- if (SUCCEEDED(hr) && m_pIo->IsAligned(Actual.cbAlign)) {
+ if(pPreferred)
+ {
+ hr = pPreferred->SetProperties(pProps, &Actual);
+
+ if(SUCCEEDED(hr) && m_pIo->IsAligned(Actual.cbAlign))
+ {
pPreferred->AddRef();
- *ppActual = pPreferred;
+ *ppActual = pPreferred;
return S_OK;
}
}
@@ -134,13 +160,15 @@ CAsyncOutputPin::RequestAllocator( // create our own allocator
IMemAllocator* pAlloc;
hr = InitAllocator(&pAlloc);
- if (FAILED(hr)) {
+ if(FAILED(hr))
+ {
return hr;
}
//...and see if we can make it suitable
hr = pAlloc->SetProperties(pProps, &Actual);
- if (SUCCEEDED(hr) && m_pIo->IsAligned(Actual.cbAlign)) {
+ if(SUCCEEDED(hr) && m_pIo->IsAligned(Actual.cbAlign))
+ {
// we need to release our refcount on pAlloc, and addref
// it to pass a refcount to the caller - this is a net nothing.
*ppActual = pAlloc;
@@ -152,7 +180,8 @@ CAsyncOutputPin::RequestAllocator( // if we failed because of the IsAligned test, the error code will
// not be failure
- if (SUCCEEDED(hr)) {
+ if(SUCCEEDED(hr))
+ {
hr = VFW_E_BADALIGN;
}
return hr;
@@ -161,32 +190,36 @@ CAsyncOutputPin::RequestAllocator( // queue an aligned read request. call WaitForNext to get
// completion.
-STDMETHODIMP
-CAsyncOutputPin::Request(
+STDMETHODIMP CAsyncOutputPin::Request(
IMediaSample* pSample,
- DWORD_PTR dwUser) // user context
+ DWORD_PTR dwUser) // user context
{
+ CheckPointer(pSample,E_POINTER);
+
REFERENCE_TIME tStart, tStop;
HRESULT hr = pSample->GetTime(&tStart, &tStop);
- if (FAILED(hr)) {
- return hr;
+ if(FAILED(hr))
+ {
+ return hr;
}
LONGLONG llPos = tStart / UNITS;
LONG lLength = (LONG) ((tStop - tStart) / UNITS);
- LONGLONG llTotal;
- LONGLONG llAvailable;
- hr = m_pIo->Length(&llTotal, &llAvailable);
- if (llPos + lLength > llTotal) {
+ LONGLONG llTotal=0, llAvailable=0;
+ hr = m_pIo->Length(&llTotal, &llAvailable);
+ if(llPos + lLength > llTotal)
+ {
// the end needs to be aligned, but may have been aligned
// on a coarser alignment.
LONG lAlign;
m_pIo->Alignment(&lAlign);
+
llTotal = (llTotal + lAlign -1) & ~(lAlign-1);
- if (llPos + lLength > llTotal) {
+ if(llPos + lLength > llTotal)
+ {
lLength = (LONG) (llTotal - llPos);
// must be reducing this!
@@ -196,48 +229,54 @@ CAsyncOutputPin::Request( }
}
-
BYTE* pBuffer;
hr = pSample->GetPointer(&pBuffer);
- if (FAILED(hr)) {
- return hr;
+ if(FAILED(hr))
+ {
+ return hr;
}
- return m_pIo->Request(
- llPos,
- lLength,
- TRUE,
- pBuffer,
- (LPVOID)pSample,
- dwUser);
+ return m_pIo->Request(llPos,
+ lLength,
+ TRUE,
+ pBuffer,
+ (LPVOID)pSample,
+ dwUser);
}
+
// sync-aligned request. just like a request/waitfornext pair.
-STDMETHODIMP
+STDMETHODIMP
CAsyncOutputPin::SyncReadAligned(
IMediaSample* pSample)
{
+ CheckPointer(pSample,E_POINTER);
+
REFERENCE_TIME tStart, tStop;
HRESULT hr = pSample->GetTime(&tStart, &tStop);
- if (FAILED(hr)) {
- return hr;
+ if(FAILED(hr))
+ {
+ return hr;
}
LONGLONG llPos = tStart / UNITS;
LONG lLength = (LONG) ((tStop - tStart) / UNITS);
+
LONGLONG llTotal;
LONGLONG llAvailable;
hr = m_pIo->Length(&llTotal, &llAvailable);
- if (llPos + lLength > llTotal) {
-
+ if(llPos + lLength > llTotal)
+ {
// the end needs to be aligned, but may have been aligned
// on a coarser alignment.
LONG lAlign;
m_pIo->Alignment(&lAlign);
+
llTotal = (llTotal + lAlign -1) & ~(lAlign-1);
- if (llPos + lLength > llTotal) {
+ if(llPos + lLength > llTotal)
+ {
lLength = (LONG) (llTotal - llPos);
// must be reducing this!
@@ -247,21 +286,19 @@ CAsyncOutputPin::SyncReadAligned( }
}
-
BYTE* pBuffer;
hr = pSample->GetPointer(&pBuffer);
- if (FAILED(hr)) {
- return hr;
+ if(FAILED(hr))
+ {
+ return hr;
}
LONG cbActual;
- hr = m_pIo->SyncReadAligned(
- llPos,
- lLength,
- pBuffer,
- &cbActual,
- pSample
- );
+ hr = m_pIo->SyncReadAligned(llPos,
+ lLength,
+ pBuffer,
+ &cbActual,
+ pSample);
pSample->SetActualDataLength(cbActual);
return hr;
@@ -274,19 +311,20 @@ STDMETHODIMP CAsyncOutputPin::WaitForNext(
DWORD dwTimeout,
IMediaSample** ppSample, // completed sample
- DWORD_PTR* pdwUser) // user context
+ DWORD_PTR * pdwUser) // user context
{
+ CheckPointer(ppSample,E_POINTER);
+
LONG cbActual;
- IMediaSample* pSample;
+ IMediaSample* pSample=0;
- HRESULT hr = m_pIo->WaitForNext(
- dwTimeout,
- (LPVOID*) &pSample,
- (DWORD*)pdwUser,
- &cbActual
- );
+ HRESULT hr = m_pIo->WaitForNext(dwTimeout,
+ (LPVOID*) &pSample,
+ pdwUser,
+ &cbActual);
- if (SUCCEEDED(hr)) {
+ if(SUCCEEDED(hr))
+ {
pSample->SetActualDataLength(cbActual);
}
@@ -299,13 +337,14 @@ CAsyncOutputPin::WaitForNext( // synchronous read that need not be aligned.
STDMETHODIMP
CAsyncOutputPin::SyncRead(
- LONGLONG llPosition, // absolute Io position
- LONG lLength, // nr bytes required
- BYTE* pBuffer) // write data here
+ LONGLONG llPosition, // absolute Io position
+ LONG lLength, // nr bytes required
+ BYTE* pBuffer) // write data here
{
return m_pIo->SyncRead(llPosition, lLength, pBuffer);
}
+
// return the length of the file, and the length currently
// available locally. We only support locally accessible files,
// so they are always the same
@@ -314,16 +353,17 @@ CAsyncOutputPin::Length( LONGLONG* pTotal,
LONGLONG* pAvailable)
{
- HRESULT hr = m_pIo->Length(pTotal, pAvailable);
- return hr;
+ return m_pIo->Length(pTotal, pAvailable);
}
+
STDMETHODIMP
CAsyncOutputPin::BeginFlush(void)
{
return m_pIo->BeginFlush();
}
+
STDMETHODIMP
CAsyncOutputPin::EndFlush(void)
{
@@ -341,6 +381,7 @@ CAsyncOutputPin::Connect( }
+
// --- CAsyncReader implementation ---
#pragma warning(disable:4355)
@@ -352,17 +393,17 @@ CAsyncReader::CAsyncReader( HRESULT *phr,
const CLSID& clsid)
: CBaseFilter(
- pName,
- pUnk,
- &m_csFilter,
- clsid,
- NULL
- ),
+ pName,
+ pUnk,
+ &m_csFilter,
+ clsid,
+ NULL
+ ),
m_OutputPin(
- phr,
- this,
- &m_Io,
- &m_csFilter),
+ phr,
+ this,
+ &m_Io,
+ &m_csFilter),
m_Io(pStream)
{
}
@@ -387,21 +428,22 @@ ULONG CAsyncReader::GetMiscFlags() return AM_FILTER_MISC_FLAGS_IS_SOURCE;
}
-
-int
-CAsyncReader::GetPinCount()
+int CAsyncReader::GetPinCount()
{
return 1;
}
-CBasePin *
-CAsyncReader::GetPin(int n)
+CBasePin * CAsyncReader::GetPin(int n)
{
- if ((GetPinCount() > 0) && (n == 0)) {
- return &m_OutputPin;
- } else {
- return NULL;
+ if((GetPinCount() > 0) && (n == 0))
+ {
+ return &m_OutputPin;
+ }
+ else
+ {
+ return NULL;
}
}
+
diff --git a/src/filters/reader/asyncreader/asyncrdr.h b/src/filters/reader/asyncreader/asyncrdr.h index 467662d0f..53572b29c 100644 --- a/src/filters/reader/asyncreader/asyncrdr.h +++ b/src/filters/reader/asyncreader/asyncrdr.h @@ -1,3 +1,12 @@ +//------------------------------------------------------------------------------
+// File: AsyncRdr.h
+//
+// Desc: DirectShow sample code - base library for I/O functionality.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+//------------------------------------------------------------------------------
+
+
#pragma once
//
@@ -13,6 +22,7 @@ // all the work.
//
+
// the filter class (defined below)
class CAsyncReader;
@@ -39,8 +49,8 @@ public: // constructor and destructor
CAsyncOutputPin(
HRESULT * phr,
- CAsyncReader *pReader,
- CAsyncIo *pIo,
+ CAsyncReader *pReader,
+ CAsyncIo *pIo,
CCritSec * pLock);
~CAsyncOutputPin();
@@ -79,6 +89,7 @@ public: if (m_bQueriedForAsyncReader) {
return CBasePin::CompleteConnect(pReceivePin);
} else {
+
#ifdef VFW_E_NO_TRANSPORT
return VFW_E_NO_TRANSPORT;
#else
@@ -114,7 +125,7 @@ public: // GetPointer until after returning from WaitForNext.
STDMETHODIMP Request(
IMediaSample* pSample,
- DWORD_PTR dwUser); // user context
+ DWORD_PTR dwUser); // user context
// block until the next sample is completed or the timeout occurs.
// timeout (millisecs) may be 0 or INFINITE. Samples may not
@@ -124,7 +135,7 @@ public: STDMETHODIMP WaitForNext(
DWORD dwTimeout,
IMediaSample** ppSample, // completed sample
- DWORD_PTR* pdwUser); // user context
+ DWORD_PTR * pdwUser); // user context
// sync read of data. Sample passed in must have been acquired from
// the agreed allocator. Start and stop position must be aligned.
@@ -138,9 +149,9 @@ public: // need not be aligned. Will fail if read is beyond actual total
// length.
STDMETHODIMP SyncRead(
- LONGLONG llPosition, // absolute file position
- LONG lLength, // nr bytes required
- BYTE* pBuffer); // write data here
+ LONGLONG llPosition, // absolute file position
+ LONG lLength, // nr bytes required
+ BYTE* pBuffer); // write data here
// return total length of stream, and currently available length.
// reads for beyond the available length but within the total length will
@@ -176,10 +187,10 @@ protected: CAsyncOutputPin m_OutputPin;
// Type we think our data is
- CMediaType m_mt;
+ CMediaType m_mt;
public:
-
+
// construction / destruction
CAsyncReader(
@@ -187,14 +198,15 @@ public: LPUNKNOWN pUnk,
CAsyncStream *pStream,
HRESULT *phr,
- const CLSID& clsid);
+ const CLSID& clsid);
+
~CAsyncReader();
- DECLARE_IUNKNOWN;
+ DECLARE_IUNKNOWN;
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
- // IAMFilterMiscFlags
- STDMETHODIMP_(ULONG) GetMiscFlags();
+ // IAMFilterMiscFlags
+ STDMETHODIMP_(ULONG) GetMiscFlags();
// --- CBaseFilter methods ---
int GetPinCount();
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj index 01e2dc42a..6cd3edf9d 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
IgnoreAllDefaultLibraries="false"
ModuleDefinitionFile="MpcAudioRenderer.def"
SubSystem="2"
@@ -93,7 +93,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -135,7 +135,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MpcAudioRenderer.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -166,7 +166,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -206,7 +206,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MpcAudioRenderer.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -239,7 +239,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -281,7 +281,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MpcAudioRenderer.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/renderer/SyncClock/SyncClock.vcproj b/src/filters/renderer/SyncClock/SyncClock.vcproj index 57d7d9f08..423d505d9 100644 --- a/src/filters/renderer/SyncClock/SyncClock.vcproj +++ b/src/filters/renderer/SyncClock/SyncClock.vcproj @@ -340,8 +340,6 @@ AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -404,7 +402,6 @@ Optimization="2"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL"
- RuntimeLibrary="0"
EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -444,7 +441,7 @@ <Configuration
Name="Debug|Win32"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
CharacterSet="1"
>
@@ -472,11 +469,6 @@ OmitFramePointers="false"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- StringPooling="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="0"
- BufferSecurityCheck="true"
- EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
@@ -538,7 +530,6 @@ Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL"
- RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/src/filters/source/D2VSource/d2vsource.vcproj b/src/filters/source/D2VSource/d2vsource.vcproj index a9643a788..50902bffc 100644 --- a/src/filters/source/D2VSource/d2vsource.vcproj +++ b/src/filters/source/D2VSource/d2vsource.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib basesource.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="D2VSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib basesource.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="D2VSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib basesource.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="D2VSource.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib basesource.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="D2VSource.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/source/DTSAC3Source/dtsac3source.vcproj b/src/filters/source/DTSAC3Source/dtsac3source.vcproj index 0ab5e85b0..59d33d7f1 100644 --- a/src/filters/source/DTSAC3Source/dtsac3source.vcproj +++ b/src/filters/source/DTSAC3Source/dtsac3source.vcproj @@ -252,7 +252,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -292,7 +292,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="DTSAC3Source.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -323,7 +323,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -365,7 +365,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="DTSAC3Source.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -396,7 +396,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -436,7 +436,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DTSAC3Source.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -469,7 +469,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -511,7 +511,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DTSAC3Source.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/source/FLICSource/flicsource.vcproj b/src/filters/source/FLICSource/flicsource.vcproj index 127717967..8c6aec843 100644 --- a/src/filters/source/FLICSource/flicsource.vcproj +++ b/src/filters/source/FLICSource/flicsource.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="FLICSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="FLICSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="FLICSource.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="FLICSource.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/source/FlacSource/Flacsource.vcproj b/src/filters/source/FlacSource/Flacsource.vcproj index 99b3fa7db..9b0fac608 100644 --- a/src/filters/source/FlacSource/Flacsource.vcproj +++ b/src/filters/source/FlacSource/Flacsource.vcproj @@ -258,7 +258,7 @@ </Configuration>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -298,7 +298,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib libflac.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="FlacSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -329,7 +329,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -371,7 +371,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib libflac.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="FlacSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -402,7 +402,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -443,7 +443,7 @@ AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib libflac.lib"
ShowProgress="0"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="FlacSource.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -476,7 +476,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -518,7 +518,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib libflac.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="FlacSource.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/source/ShoutcastSource/shoutcastsource.vcproj b/src/filters/source/ShoutcastSource/shoutcastsource.vcproj index ccb56c723..06524fde0 100644 --- a/src/filters/source/ShoutcastSource/shoutcastsource.vcproj +++ b/src/filters/source/ShoutcastSource/shoutcastsource.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="ShoutcastSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="ShoutcastSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="ShoutcastSource.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="ShoutcastSource.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/source/SubtitleSource/subtitlesource.vcproj b/src/filters/source/SubtitleSource/subtitlesource.vcproj index a0fc60e79..b02082378 100644 --- a/src/filters/source/SubtitleSource/subtitlesource.vcproj +++ b/src/filters/source/SubtitleSource/subtitlesource.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib subtitles.lib subpic.lib dsutil.lib Winmm.lib comsuppw.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="SubtitleSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib subtitles.lib subpic.lib dsutil.lib Winmm.lib comsuppw.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="SubtitleSource.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib subtitles.lib subpic.lib dsutil.lib Winmm.lib comsuppw.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="SubtitleSource.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib subtitles.lib subpic.lib dsutil.lib Winmm.lib comsuppw.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="SubtitleSource.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/switcher/AudioSwitcher/audioswitcher.vcproj b/src/filters/switcher/AudioSwitcher/audioswitcher.vcproj index faa5c9064..a59eab39a 100644 --- a/src/filters/switcher/AudioSwitcher/audioswitcher.vcproj +++ b/src/filters/switcher/AudioSwitcher/audioswitcher.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="AudioSwitcher.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -93,7 +93,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -135,7 +135,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="AudioSwitcher.def"
DelayLoadDLLs=""
SubSystem="2"
@@ -167,7 +167,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -207,7 +207,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="AudioSwitcher.def"
DelayLoadDLLs=""
GenerateDebugInformation="true"
@@ -241,7 +241,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -283,7 +283,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="AudioSwitcher.def"
DelayLoadDLLs=""
GenerateDebugInformation="true"
diff --git a/src/filters/transform/AVI2AC3Filter/avi2ac3filter.vcproj b/src/filters/transform/AVI2AC3Filter/avi2ac3filter.vcproj index e3f9478b5..6b3652a59 100644 --- a/src/filters/transform/AVI2AC3Filter/avi2ac3filter.vcproj +++ b/src/filters/transform/AVI2AC3Filter/avi2ac3filter.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="AVI2AC3Filter.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="AVI2AC3Filter.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="AVI2AC3Filter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="AVI2AC3Filter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/transform/BufferFilter/bufferfilter.vcproj b/src/filters/transform/BufferFilter/bufferfilter.vcproj index adf7598ef..23ce08169 100644 --- a/src/filters/transform/BufferFilter/bufferfilter.vcproj +++ b/src/filters/transform/BufferFilter/bufferfilter.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="BufferFilter.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="BufferFilter.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="BufferFilter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="BufferFilter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/transform/DeCSSFilter/decssfilter.vcproj b/src/filters/transform/DeCSSFilter/decssfilter.vcproj index 80a126e52..edfd6141c 100644 --- a/src/filters/transform/DeCSSFilter/decssfilter.vcproj +++ b/src/filters/transform/DeCSSFilter/decssfilter.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -62,7 +62,7 @@ Name="VCLinkerTool"
AdditionalDependencies="decss.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="DeCSSFilter.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -93,7 +93,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -136,7 +136,7 @@ Name="VCLinkerTool"
AdditionalDependencies="decss.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="DeCSSFilter.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -167,7 +167,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -207,7 +207,7 @@ Name="VCLinkerTool"
AdditionalDependencies="decss.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DeCSSFilter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -240,7 +240,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -282,7 +282,7 @@ Name="VCLinkerTool"
AdditionalDependencies="decss.lib strmbase.lib Winmm.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="DeCSSFilter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj index d303f356a..32f58c745 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj +++ b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib filters.lib strmbase.lib Winmm.lib zlib.lib basevideofilter.lib libavcodec.lib d3d9.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MPCVideoDec.def"
SubSystem="2"
TargetMachine="1"
@@ -90,7 +90,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -132,7 +132,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib filters.lib strmbase.lib Winmm.lib zlib.lib basevideofilter.lib libavcodec.lib d3d9.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="MPCVideoDec.def"
SubSystem="2"
TargetMachine="17"
@@ -161,7 +161,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -202,7 +202,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib filters.lib strmbase.lib Winmm.lib zlib.lib basevideofilter.lib libavcodec_gcc.lib libgcc.a libmingwex.a d3d9.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib;$(SolutionDir)lib"
+ AdditionalLibraryDirectories="$(SolutionDir)lib;$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MPCVideoDec.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -235,7 +235,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -277,7 +277,7 @@ Name="VCLinkerTool"
AdditionalDependencies="dsutil.lib filters.lib strmbase.lib Winmm.lib zlib.lib basevideofilter.lib libavcodec_gcc.lib libgcc.a libmingwex.a d3d9.lib"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib;$(SolutionDir)lib64"
+ AdditionalLibraryDirectories="$(SolutionDir)lib64;$(SolutionDir)bin\lib\Release_$(PlatformName)"
IgnoreDefaultLibraryNames=""
ModuleDefinitionFile="MPCVideoDec.def"
GenerateDebugInformation="true"
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/Makefile b/src/filters/transform/MPCVideoDec/ffmpeg/Makefile index da3ef307d..f35a8d454 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/Makefile +++ b/src/filters/transform/MPCVideoDec/ffmpeg/Makefile @@ -5,28 +5,28 @@ PNG_DIR=../../../../libpng ZLIB_DIR=../../../../zlib
ifeq ($(64BIT),yes)
- OUT_DIR=../../../../../Release/x64/obj/libavcodec_gcc/
- SLIB_DIR=../../../../../Release/x64/lib/
+ OUT_DIR=../../../../../bin/obj/Release_x64/libavcodec_gcc/
+ SLIB_DIR=../../../../../bin/lib/Release_x64/
else
- OUT_DIR=../../../../../Release/Win32/obj/libavcodec_gcc/
- SLIB_DIR=../../../../../Release/Win32/lib/
+ OUT_DIR=../../../../../bin/obj/Release_Win32/libavcodec_gcc/
+ SLIB_DIR=../../../../../bin/lib/Release_Win32/
endif
ifeq ($(64BIT),yes)
-OUT_DIRS = ../../../../../Release/x64/obj/libavcodec_gcc/ \
- ../../../../../Release/x64/obj/libavcodec_gcc/libavcodec \
- ../../../../../Release/x64/obj/libavcodec_gcc/libavcodec/amr_float \
- ../../../../../Release/x64/obj/libavcodec_gcc/libavcodec/x86 \
- ../../../../../Release/x64/obj/libavcodec_gcc/libavutil \
- ../../../../../Release/x64/obj/libavcodec_gcc/libswscale \
+OUT_DIRS = ../../../../../bin/obj/Release_x64/libavcodec_gcc/ \
+ ../../../../../bin/obj/Release_x64/libavcodec_gcc/libavcodec \
+ ../../../../../bin/obj/Release_x64/libavcodec_gcc/libavcodec/amr_float \
+ ../../../../../bin/obj/Release_x64/libavcodec_gcc/libavcodec/x86 \
+ ../../../../../bin/obj/Release_x64/libavcodec_gcc/libavutil \
+ ../../../../../bin/obj/Release_x64/libavcodec_gcc/libswscale \
$(SLIB_DIR)
else
-OUT_DIRS = ../../../../../Release/Win32/obj/libavcodec_gcc/ \
- ../../../../../Release/Win32/obj/libavcodec_gcc/libavcodec \
- ../../../../../Release/Win32/obj/libavcodec_gcc/libavcodec/amr_float \
- ../../../../../Release/Win32/obj/libavcodec_gcc/libavcodec/x86 \
- ../../../../../Release/Win32/obj/libavcodec_gcc/libavutil \
- ../../../../../Release/Win32/obj/libavcodec_gcc/libswscale \
+OUT_DIRS = ../../../../../bin/obj/Release_Win32/libavcodec_gcc/ \
+ ../../../../../bin/obj/Release_Win32/libavcodec_gcc/libavcodec \
+ ../../../../../bin/obj/Release_Win32/libavcodec_gcc/libavcodec/amr_float \
+ ../../../../../bin/obj/Release_Win32/libavcodec_gcc/libavcodec/x86 \
+ ../../../../../bin/obj/Release_Win32/libavcodec_gcc/libavutil \
+ ../../../../../bin/obj/Release_Win32/libavcodec_gcc/libswscale \
$(SLIB_DIR)
endif
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.def b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.def index 8d03a8cf3..5fc7bc0e5 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.def +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.def @@ -27,7 +27,6 @@ EXPORTS avcodec_get_current_idct
avcodec_get_encoder_info
avcodec_h264_search_recovery_point
- avcodec_h264_decode_init_is_avc
av_parser_init
av_parser_parse
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj index f2a6a3079..99a14a641 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj @@ -54,7 +54,6 @@ AdditionalIncludeDirectories="..\..\..\..\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;HAVE_AV_CONFIG_H;H264_MERGE_TESTING"
ExceptionHandling="0"
- BasicRuntimeChecks="3"
OpenMP="false"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
@@ -131,7 +130,6 @@ AdditionalIncludeDirectories="..\..\..\..\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"
PreprocessorDefinitions="_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
ExceptionHandling="0"
- BasicRuntimeChecks="3"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
@@ -213,8 +211,6 @@ AdditionalIncludeDirectories="..\..\..\..\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
ExceptionHandling="0"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
FloatingPointModel="2"
FloatingPointExceptions="false"
UsePrecompiledHeader="0"
@@ -298,8 +294,6 @@ AdditionalIncludeDirectories="..\..\..\..\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"
PreprocessorDefinitions="_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"
ExceptionHandling="0"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.c index 3a9d4af60..abee048d7 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.c @@ -23,7 +23,7 @@ */
/**
- * @file libavcodec/dsputil.c
+ * @file
* DSP utils
*/
@@ -366,7 +366,7 @@ static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w) * @param w width of the source buffer
* @param h height of the source buffer
*/
-void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h,
+void ff_emulated_edge_mc(uint8_t *buf, const uint8_t *src, int linesize, int block_w, int block_h,
int src_x, int src_y, int w, int h){
int x, y;
int start_y, start_x, end_y, end_x;
@@ -942,7 +942,7 @@ static inline void OPNAME ## _pixels8_y2_c(uint8_t *block, const uint8_t *pixels OPNAME ## _pixels8_l2(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
}\
\
-static inline void OPNAME ## _pixels8_l4(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,\
+static inline void OPNAME ## _pixels8_l4(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
int i;\
for(i=0; i<h; i++){\
@@ -994,7 +994,7 @@ static inline void OPNAME ## _pixels2_y2_c(uint8_t *block, const uint8_t *pixels OPNAME ## _pixels2_l2(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
}\
\
-static inline void OPNAME ## _no_rnd_pixels8_l4(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,\
+static inline void OPNAME ## _no_rnd_pixels8_l4(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
int i;\
for(i=0; i<h; i++){\
@@ -1029,12 +1029,12 @@ static inline void OPNAME ## _no_rnd_pixels8_l4(uint8_t *dst, const uint8_t *src OP(*((uint32_t*)&dst[i*dst_stride+4]), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
}\
}\
-static inline void OPNAME ## _pixels16_l4(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,\
+static inline void OPNAME ## _pixels16_l4(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
OPNAME ## _pixels8_l4(dst , src1 , src2 , src3 , src4 , dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
OPNAME ## _pixels8_l4(dst+8, src1+8, src2+8, src3+8, src4+8, dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
}\
-static inline void OPNAME ## _no_rnd_pixels16_l4(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,\
+static inline void OPNAME ## _no_rnd_pixels16_l4(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
OPNAME ## _no_rnd_pixels8_l4(dst , src1 , src2 , src3 , src4 , dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
OPNAME ## _no_rnd_pixels8_l4(dst+8, src1+8, src2+8, src3+8, src4+8, dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.h index 22c91827f..665cd1fc3 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/dsputil.h @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/dsputil.h
+ * @file
* DSP utils.
* note, many functions in here may use MMX which trashes the FPU state, it is
* absolutely necessary to call emms_c() between dsp & float/double code
@@ -185,7 +185,7 @@ typedef struct ScanTable{ void ff_init_scantable(uint8_t *, ScanTable *st, const uint8_t *src_scantable);
-void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize,
+void ff_emulated_edge_mc(uint8_t *buf, const uint8_t *src, int linesize,
int block_w, int block_h,
int src_x, int src_y, int w, int h);
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c index ffb380bc2..b5c5c37f4 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263dec.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/h263dec.c
+ * @file
* H.263 decoder.
*/
@@ -417,7 +417,9 @@ retry: if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){
if(s->stream_codec_tag == AV_RL32("XVID") ||
s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") ||
- s->codec_tag == AV_RL32("RMP4"))
+ s->codec_tag == AV_RL32("RMP4") ||
+ s->codec_tag == AV_RL32("SIPP")
+ )
s->xvid_build= 0;
#if 0
if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1
@@ -701,7 +703,7 @@ av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time); AVCodec h263_decoder = {
"h263",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_H263,
sizeof(MpegEncContext),
ff_h263_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c index c3a5f4f70..defe2d29c 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264.c
+ * @file
* H.264 / AVC / MPEG4 part10 codec.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
@@ -758,6 +758,8 @@ fail: return -1; // free_tables will clean up for us
}
+static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size);
+
static av_cold void common_init(H264Context *h){
MpegEncContext * const s = &h->s;
@@ -778,14 +780,46 @@ static av_cold void common_init(H264Context *h){ memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
}
-// ffdshow custom code - adapted for DirectShow
-av_cold int avcodec_h264_decode_init_is_avc(AVCodecContext *avctx){
- if(avctx->extradata_size > 0 && avctx->extradata &&
- (*(char *)avctx->extradata == 1 || (avctx->codec_tag == 0x31637661 || avctx->codec_tag == 0x31435641))){
- return 1;
+int ff_h264_decode_extradata(H264Context *h)
+{
+ AVCodecContext *avctx = h->s.avctx;
+
+ /* ffdshow custom code */
+ if(*(char *)avctx->extradata == 1 || avctx->codec_tag == 0x31637661 || avctx->codec_tag == 0x31435641) {
+ int i, cnt, nalsize;
+ unsigned char *p = avctx->extradata;
+ unsigned char *pend=p+avctx->extradata_size;
+
+ h->is_avc = 1;
+
+ h->nal_length_size = 2;
+ cnt = 1;
+
+ for (i = 0; i < cnt; i++) {
+ nalsize = AV_RB16(p) + 2;
+ if(decode_nal_units(h, p, nalsize) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i);
+ return -1;
+ }
+ p += nalsize;
+ }
+ // Decode pps from avcC
+ for (i = 0; p<pend-2; i++) {
+ nalsize = AV_RB16(p) + 2;
+ if(decode_nal_units(h, p, nalsize) != nalsize) {
+ av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
+ return -1;
+ }
+ p += nalsize;
+ }
+ // Now store right nal length size, that will be use to parse all other nals
+ h->nal_length_size = avctx->nal_length_size ? avctx->nal_length_size : 4; //((*(((char*)(avctx->extradata))+4))&0x03)+1;
} else {
- return 0;
+ h->is_avc = 0;
+ if(decode_nal_units(h, avctx->extradata, avctx->extradata_size) < 0)
+ return -1;
}
+ return 0;
}
av_cold int ff_h264_decode_init(AVCodecContext *avctx){
@@ -812,6 +846,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){ else
avctx->pix_fmt= PIX_FMT_YUV420P;
/* ffdshow custom code (end) */
+
avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
ff_h264_decode_init_vlc();
@@ -822,10 +857,9 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){ h->x264_build = -1;
ff_h264_reset_sei(h);
- /* ffdshow custom code (begin) */
- h->is_avc = avcodec_h264_decode_init_is_avc(avctx);
- h->got_avcC = 0;
- /* ffdshow custom code (end) */
+ if(avctx->extradata_size > 0 && avctx->extradata &&
+ ff_h264_decode_extradata(h))
+ return -1;
if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames < h->sps.num_reorder_frames){
s->avctx->has_b_frames = h->sps.num_reorder_frames;
@@ -2883,45 +2917,6 @@ static int decode_frame(AVCodecContext *avctx, return 0;
}
- /* ffdshow custom code (begin) */
- if(h->is_avc && !h->got_avcC) {
- int i, cnt, nalsize;
- unsigned char *p = avctx->extradata, *pend=p+avctx->extradata_size;
-
- h->nal_length_size = 2;
- cnt = 1;
-
- for (i = 0; i < cnt; i++) {
- nalsize = AV_RB16(p) + 2;
- if(decode_nal_units(h, p, nalsize) < 0) { // mpc-hc fix for files created by certain digital cameras
- av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i);
- return -1;
- }
- p += nalsize;
- }
- // Decode pps from avcC
- for (i = 0; p<pend-2; i++) {
- nalsize = AV_RB16(p) + 2;
- if(decode_nal_units(h, p, nalsize) != nalsize) {
- av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
- return -1;
- }
- p += nalsize;
- }
- // Now store right nal length size, that will be use to parse all other nals
- h->nal_length_size = avctx->nal_length_size?avctx->nal_length_size:4;//((*(((char*)(avctx->extradata))+4))&0x03)+1;
- // Do not reparse avcC
- h->got_avcC = 1;
- }
-
- if(!h->got_avcC && !h->is_avc && s->avctx->extradata_size){
- if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
- return -1;
- h->got_avcC = 1;
- s->picture_number++;
- }
- /* ffdshow custom code (end) */
-
buf_index=decode_nal_units(h, buf, buf_size);
if(buf_index < 0)
return -1;
@@ -3266,7 +3261,7 @@ av_cold int ff_h264_decode_end(AVCodecContext *avctx) AVCodec h264_decoder = {
"h264",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_H264,
sizeof(H264Context),
/*.init = */ff_h264_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h index c6650a13d..b5bbd33f1 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264.h
+ * @file
* H.264 / AVC / MPEG4 part10 codec.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
@@ -467,7 +467,6 @@ typedef struct H264Context{ * Used to parse AVC variant of h264
*/
int is_avc; ///< this flag is != 0 if codec is avc1
- int got_avcC; ///< flag used to parse avcC data only once
int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4)
SPS *sps_buffers[MAX_SPS_COUNT];
@@ -699,6 +698,7 @@ int ff_h264_check_intra_pred_mode(H264Context *h, int mode); void ff_h264_write_back_intra_pred_mode(H264Context *h);
void ff_h264_hl_decode_mb(H264Context *h);
int ff_h264_frame_start(H264Context *h);
+int ff_h264_decode_extradata(H264Context *h);
av_cold int ff_h264_decode_init(AVCodecContext *avctx);
av_cold int ff_h264_decode_end(AVCodecContext *avctx);
av_cold void ff_h264_decode_init_vlc(void);
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_dxva.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_dxva.c index 47a4211b1..697b58a72 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_dxva.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_dxva.c @@ -744,9 +744,6 @@ static int decode_nal_units_noexecute(H264Context *h, const uint8_t *buf, int bu break;
// <== End patch MPC DXVA
- avctx->profile = hx->sps.profile_idc;
- avctx->level = hx->sps.level_idc;
-
s->current_picture_ptr->key_frame |=
(hx->nal_unit_type == NAL_IDR_SLICE) ||
(h->sei_recovery_frame_cnt >= 0);
@@ -767,9 +764,6 @@ static int decode_nal_units_noexecute(H264Context *h, const uint8_t *buf, int bu break;
// <== End patch MPC DXVA
- avctx->profile = hx->sps.profile_idc;
- avctx->level = hx->sps.level_idc;
-
hx->s.data_partitioning = 1;
break;
@@ -841,10 +835,10 @@ static int decode_nal_units_noexecute(H264Context *h, const uint8_t *buf, int bu goto again;
}
}
- // ==> Start patch MPC DXVA
+ // ==> Start patch MPC DXVA
//if(context_count)
// execute_decode_slices(h, context_count);
- // <== End patch MPC DXVA
+ // <== End patch MPC DXVA
return buf_index;
}
@@ -892,45 +886,6 @@ int av_h264_decode_frame(struct AVCodecContext* avctx, int* nOutPOC, int64_t* rt return 0;
}
- /* ffdshow custom code (begin) */
- if(h->is_avc && !h->got_avcC) {
- int i, cnt, nalsize;
- unsigned char *p = avctx->extradata, *pend=p+avctx->extradata_size;
-
- h->nal_length_size = 2;
- cnt = 1;
-
- for (i = 0; i < cnt; i++) {
- nalsize = AV_RB16(p) + 2;
- if(decode_nal_units(h, p, nalsize) != nalsize) {
- av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i);
- return -1;
- }
- p += nalsize;
- }
- // Decode pps from avcC
- for (i = 0; p<pend-2; i++) {
- nalsize = AV_RB16(p) + 2;
- if(decode_nal_units(h, p, nalsize) != nalsize) {
- av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
- return -1;
- }
- p += nalsize;
- }
- // Now store right nal length size, that will be use to parse all other nals
- h->nal_length_size = avctx->nal_length_size?avctx->nal_length_size:4;//((*(((char*)(avctx->extradata))+4))&0x03)+1;
- // Do not reparse avcC
- h->got_avcC = 1;
- }
-
- if(!h->got_avcC && !h->is_avc && s->avctx->extradata_size){
- if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
- return -1;
- h->got_avcC = 1;
- s->picture_number++;
- }
- /* ffdshow custom code (end) */
-
// ==> Start patch MPC DXVA
buf_index=decode_nal_units_noexecute(h, buf, buf_size);
// <== End patch MPC DXVA
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp3.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp3.c index b3b8c1d44..cceee6037 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp3.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp3.c @@ -138,6 +138,7 @@ typedef struct Vp3DecodeContext { DSPContext dsp;
int flipped_image;
int last_slice_end;
+ int skip_loop_filter;
int qps[3];
int nqps;
@@ -1501,7 +1502,8 @@ static void render_slice(Vp3DecodeContext *s, int slice) }
// Filter up to the last row in the superblock row
- apply_loop_filter(s, plane, 4*sb_y - !!sb_y, FFMIN(4*sb_y+3, fragment_height-1));
+ if (!s->skip_loop_filter)
+ apply_loop_filter(s, plane, 4*sb_y - !!sb_y, FFMIN(4*sb_y+3, fragment_height-1));
}
}
@@ -1767,6 +1769,9 @@ static int vp3_decode_frame(AVCodecContext *avctx, s->keyframe?"key":"", counter, s->qps[0]);
counter++;
+ s->skip_loop_filter = !s->filter_limit_values[s->qps[0]] ||
+ avctx->skip_loop_filter >= (s->keyframe ? AVDISCARD_ALL : AVDISCARD_NONKEY);
+
if (s->qps[0] != s->last_qps[0])
init_loop_filter(s);
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec_gcc.vcproj b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec_gcc.vcproj index 8c4adca9a..0bc23909e 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec_gcc.vcproj +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec_gcc.vcproj @@ -21,8 +21,8 @@ <Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\libavcodec_gcc"
+ OutputDirectory="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName)"
+ IntermediateDirectory="$(SolutionDir)bin\obj\$(ConfigurationName)_$(PlatformName)\$(ProjectName)"
ConfigurationType="0"
>
<Tool
@@ -41,8 +41,8 @@ </Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\libavcodec_gcc"
+ OutputDirectory="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName)"
+ IntermediateDirectory="$(SolutionDir)bin\obj\$(ConfigurationName)_$(PlatformName)\$(ProjectName)"
ConfigurationType="0"
>
<Tool
@@ -61,8 +61,8 @@ </Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\libavcodec_gcc"
+ OutputDirectory="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName)"
+ IntermediateDirectory="$(SolutionDir)bin\obj\$(ConfigurationName)_$(PlatformName)\$(ProjectName)"
ConfigurationType="0"
>
<Tool
@@ -81,8 +81,8 @@ </Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\libavcodec_gcc"
+ OutputDirectory="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName)"
+ IntermediateDirectory="$(SolutionDir)bin\obj\$(ConfigurationName)_$(PlatformName)\$(ProjectName)"
ConfigurationType="0"
>
<Tool
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj index 594bfeedc..99babd214 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
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="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName);$(SolutionDir)lib\detours"
ModuleDefinitionFile="MpaDecFilter.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -92,7 +92,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -134,7 +134,7 @@ Name="VCLinkerTool"
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="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName);$(SolutionDir)lib64\detours"
ModuleDefinitionFile="MpaDecFilter.def"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -165,7 +165,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -205,7 +205,7 @@ Name="VCLinkerTool"
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"
+ AdditionalLibraryDirectories="$(SolutionDir)lib;$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MpaDecFilter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -238,7 +238,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -280,7 +280,7 @@ Name="VCLinkerTool"
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"
+ AdditionalLibraryDirectories="$(SolutionDir)lib64;$(SolutionDir)bin\lib\Release_$(PlatformName)"
ModuleDefinitionFile="MpaDecFilter.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj b/src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj index 137c425d0..fa47f8a94 100644 --- a/src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj +++ b/src/filters/transform/MpaDecFilter/libdca/vc++/libdca.vcproj @@ -49,7 +49,6 @@ AdditionalIncludeDirectories=".;..\include;..\..\..\..\..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/libdca.pch"
AssemblerListingLocation=""
ObjectFile="$(IntDir)\"
@@ -125,7 +124,6 @@ AdditionalIncludeDirectories=".;..\include;..\..\..\..\..\..\include"
PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
PrecompiledHeaderFile=".\Release/libdca.pch"
AssemblerListingLocation=""
diff --git a/src/filters/transform/MpaDecFilter/libflac/src/libFLAC/libflac.vcproj b/src/filters/transform/MpaDecFilter/libflac/src/libFLAC/libflac.vcproj index 7e3522ccd..fa0eafc91 100644 --- a/src/filters/transform/MpaDecFilter/libflac/src/libFLAC/libflac.vcproj +++ b/src/filters/transform/MpaDecFilter/libflac/src/libFLAC/libflac.vcproj @@ -292,11 +292,11 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath=".\include\protected\all.h"
+ RelativePath=".\include\private\all.h"
>
</File>
<File
- RelativePath=".\include\private\all.h"
+ RelativePath=".\include\protected\all.h"
>
</File>
<File
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj index 33b2f9347..26abe0ecd 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -61,7 +61,7 @@ Name="VCLinkerTool"
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)Debug\$(PlatformName)\lib;$(SolutionDir)lib\detours"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName);$(SolutionDir)lib\detours"
IgnoreDefaultLibraryNames="LIBCMT"
ModuleDefinitionFile="Mpeg2DecFilter.def"
SubSystem="2"
@@ -93,7 +93,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="1"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -131,7 +131,7 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib;$(SolutionDir)lib64\detours"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName);$(SolutionDir)lib64\detours"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
@@ -159,7 +159,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -199,7 +199,7 @@ Name="VCLinkerTool"
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"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName);$(SolutionDir)lib\detours"
ModuleDefinitionFile="Mpeg2DecFilter.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -232,7 +232,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="1"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -271,7 +271,7 @@ <Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).ax"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName);$(SolutionDir)lib64\detours"
GenerateDebugInformation="true"
LargeAddressAware="2"
RandomizedBaseAddress="2"
diff --git a/src/filters/transform/vsfilter/VSFilter.vcproj b/src/filters/transform/vsfilter/VSFilter.vcproj index f88def550..67347d5ce 100644 --- a/src/filters/transform/vsfilter/VSFilter.vcproj +++ b/src/filters/transform/vsfilter/VSFilter.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Debug Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -64,7 +64,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib subtitles.lib subpic.lib basevideofilter.lib Winmm.lib comsuppwd.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="VSFilter.def"
SubSystem="2"
TargetMachine="1"
@@ -93,7 +93,7 @@ </Configuration>
<Configuration
Name="Debug Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64_Debug"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="1"
@@ -137,7 +137,7 @@ Name="VCLinkerTool"
AdditionalDependencies="strmbase.lib dsutil.lib subtitles.lib subpic.lib basevideofilter.lib Winmm.lib comsuppwd.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
- AdditionalLibraryDirectories="$(SolutionDir)Debug\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"
ModuleDefinitionFile="VSFilter.def"
SubSystem="2"
TargetMachine="17"
@@ -166,7 +166,7 @@ </Configuration>
<Configuration
Name="Release Filter|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x86"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -210,7 +210,7 @@ Name="VCLinkerTool"
AdditionalDependencies="delayimp.lib strmbase.lib dsutil.lib subtitles.lib subpic.lib basevideofilter.lib Winmm.lib comsuppwd.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
IgnoreDefaultLibraryNames="MSVCRT"
ModuleDefinitionFile="VSFilter.def"
DelayLoadDLLs="oleacc.dll"
@@ -245,7 +245,7 @@ </Configuration>
<Configuration
Name="Release Filter|x64"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\$(PlatformName)"
+ OutputDirectory="$(SolutionDir)bin\Filters_x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="1"
@@ -291,7 +291,7 @@ Name="VCLinkerTool"
AdditionalDependencies="delayimp.lib strmbase.lib dsutil.lib subtitles.lib subpic.lib basevideofilter.lib Winmm.lib comsuppwd.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
- AdditionalLibraryDirectories="$(SolutionDir)Release\$(PlatformName)\lib"
+ AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"
IgnoreDefaultLibraryNames="MSVCRT"
ModuleDefinitionFile="VSFilter.def"
DelayLoadDLLs="oleacc.dll"
diff --git a/src/release.vsprops b/src/release.vsprops index 3c9dba54d..50c7dd416 100644 --- a/src/release.vsprops +++ b/src/release.vsprops @@ -3,6 +3,7 @@ ProjectType="Visual C++"
Version="8.00"
Name="release"
+ InheritedPropertySheets=".\common.vsprops"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/src/subtitles/libssf/libssf.vcproj b/src/subtitles/libssf/libssf.vcproj index 133badab4..cbc86cb94 100644 --- a/src/subtitles/libssf/libssf.vcproj +++ b/src/subtitles/libssf/libssf.vcproj @@ -47,8 +47,6 @@ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\include;..\..\filters\BaseClasses"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
UsePrecompiledHeader="2"
/>
<Tool
diff --git a/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj b/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj index f0a7e46c7..8eb656c51 100644 --- a/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj +++ b/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj @@ -52,7 +52,6 @@ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="h;..\h"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX"
- EnableFunctionLevelLinking="true"
DisableSpecificWarnings="4244;4267"
/>
<Tool
@@ -119,7 +118,6 @@ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="h;..\h"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX"
- EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
DisableSpecificWarnings="4244;4267"
/>
diff --git a/src/thirdparty/VirtualDub/system/system.vcproj b/src/thirdparty/VirtualDub/system/system.vcproj index 78b5f701d..0328804ea 100644 --- a/src/thirdparty/VirtualDub/system/system.vcproj +++ b/src/thirdparty/VirtualDub/system/system.vcproj @@ -52,7 +52,6 @@ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\h,.\h"
PreprocessorDefinitions="NDEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN"
- EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
DisableSpecificWarnings="4244;4267;4996"
/>
@@ -120,7 +119,6 @@ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\h,.\h"
PreprocessorDefinitions="NDEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN"
- EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="2"
DebugInformationFormat="3"
diff --git a/src/ui/CmdUI/CmdUI.vcproj b/src/ui/CmdUI/CmdUI.vcproj index 2d7daba7e..3310214f1 100644 --- a/src/ui/CmdUI/CmdUI.vcproj +++ b/src/ui/CmdUI/CmdUI.vcproj @@ -157,7 +157,6 @@ Name="VCCLCompilerTool"
AdditionalOptions="/MP"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- BufferSecurityCheck="true"
EnableEnhancedInstructionSet="1"
DisableSpecificWarnings="4244"
/>
diff --git a/src/ui/LCDUI/LCDUI.vcproj b/src/ui/LCDUI/LCDUI.vcproj index e3f44a521..97caa244b 100644 --- a/src/ui/LCDUI/LCDUI.vcproj +++ b/src/ui/LCDUI/LCDUI.vcproj @@ -159,7 +159,6 @@ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- BufferSecurityCheck="true"
EnableEnhancedInstructionSet="1"
DisableSpecificWarnings="4244"
/>
diff --git a/src/ui/ResizableLib/ResizableLib.vcproj b/src/ui/ResizableLib/ResizableLib.vcproj index 4af680a23..fe908f2b6 100644 --- a/src/ui/ResizableLib/ResizableLib.vcproj +++ b/src/ui/ResizableLib/ResizableLib.vcproj @@ -157,7 +157,6 @@ Name="VCCLCompilerTool"
AdditionalOptions="/MP"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- BufferSecurityCheck="true"
EnableEnhancedInstructionSet="1"
DisableSpecificWarnings="4244"
/>
diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj index 69421a1bf..b76d25514 100644 --- a/src/ui/TreePropSheet/TreePropSheet.vcproj +++ b/src/ui/TreePropSheet/TreePropSheet.vcproj @@ -157,7 +157,6 @@ Name="VCCLCompilerTool"
AdditionalOptions="/MP"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- BufferSecurityCheck="true"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
DisableSpecificWarnings="4244"
diff --git a/src/ui/sizecbar/sizecbar.vcproj b/src/ui/sizecbar/sizecbar.vcproj index 24b039fe2..acbeb890e 100644 --- a/src/ui/sizecbar/sizecbar.vcproj +++ b/src/ui/sizecbar/sizecbar.vcproj @@ -157,7 +157,6 @@ Name="VCCLCompilerTool"
AdditionalOptions="/MP"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- BufferSecurityCheck="true"
EnableEnhancedInstructionSet="1"
DisableSpecificWarnings="4244"
/>
|