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 /src/filters/transform/MpaDecFilter | |
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
Diffstat (limited to 'src/filters/transform/MpaDecFilter')
3 files changed, 10 insertions, 12 deletions
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
|