diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-05-28 04:16:57 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-05-28 04:16:57 +0400 |
commit | 169ce3df8f2db6eb61705d67e1588498cdea76d3 (patch) | |
tree | 60d1df7577df3d74173961175627f505c4199a53 /src/thirdparty | |
parent | 83ed1890be244e582fd47adbf5329920cc01f621 (diff) | |
parent | 0fcf2d877e956c1521f12d675c1ab33d6a1302e9 (diff) |
merged newprojects branch into the trunk
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1964 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/thirdparty')
-rw-r--r-- | src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj | 56 | ||||
-rw-r--r-- | src/thirdparty/VirtualDub/system/system.vcproj | 56 |
2 files changed, 10 insertions, 102 deletions
diff --git a/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj b/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj index 1d7506452..8eb656c51 100644 --- a/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj +++ b/src/thirdparty/VirtualDub/Kasumi/Kasumi.vcproj @@ -23,10 +23,8 @@ <Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -51,17 +49,9 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="h;..\h"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX"
- StringPooling="true"
- MinimalRebuild="false"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
DisableSpecificWarnings="4244;4267"
/>
<Tool
@@ -77,8 +67,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"
- SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -100,10 +88,8 @@ </Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -129,17 +115,10 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="h;..\h"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX"
- StringPooling="true"
- MinimalRebuild="false"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
+ EnableEnhancedInstructionSet="0"
DisableSpecificWarnings="4244;4267"
/>
<Tool
@@ -155,8 +134,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"
- SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -178,10 +155,8 @@ </Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -206,16 +181,8 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="0"
AdditionalIncludeDirectories="h;..\h"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX"
- StringPooling="true"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
DisableSpecificWarnings="4244;4267"
/>
<Tool
@@ -231,8 +198,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\lib\$(ProjectName)DU.lib"
- SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -254,10 +219,8 @@ </Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -283,15 +246,8 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="0"
AdditionalIncludeDirectories="h;..\h"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX"
- StringPooling="true"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4244;4267"
/>
@@ -308,8 +264,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\lib64\$(ProjectName)DU.lib"
- SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
diff --git a/src/thirdparty/VirtualDub/system/system.vcproj b/src/thirdparty/VirtualDub/system/system.vcproj index d936c3f7a..0328804ea 100644 --- a/src/thirdparty/VirtualDub/system/system.vcproj +++ b/src/thirdparty/VirtualDub/system/system.vcproj @@ -23,10 +23,8 @@ <Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -52,18 +50,9 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="1"
- InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\h,.\h"
PreprocessorDefinitions="NDEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN"
- StringPooling="true"
- MinimalRebuild="false"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
DisableSpecificWarnings="4244;4267;4996"
/>
<Tool
@@ -79,8 +68,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"
- SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -102,10 +89,8 @@ </Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -132,17 +117,10 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="1"
- InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\h,.\h"
PreprocessorDefinitions="NDEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN"
- StringPooling="true"
- MinimalRebuild="false"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="2"
- WarningLevel="3"
- SuppressStartupBanner="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4244;4267;4996"
/>
@@ -159,8 +137,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"
- SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -182,10 +158,8 @@ </Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -211,16 +185,9 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="0"
AdditionalIncludeDirectories="../h,.\h"
PreprocessorDefinitions="_DEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN"
- StringPooling="true"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
UsePrecompiledHeader="2"
- WarningLevel="3"
- SuppressStartupBanner="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4244;4267;4996"
/>
@@ -237,8 +204,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\lib\$(ProjectName)DU.lib"
- SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -260,10 +225,8 @@ </Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\common.vsprops"
+ InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -290,16 +253,9 @@ <Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="0"
AdditionalIncludeDirectories="../h,.\h"
PreprocessorDefinitions="_DEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN"
- StringPooling="true"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
UsePrecompiledHeader="2"
- WarningLevel="3"
- SuppressStartupBanner="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4244;4267;4996"
/>
@@ -316,8 +272,6 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\..\lib64\$(ProjectName)DU.lib"
- SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
|