ref: 3797aa1a148efaa6bf7d17906bbf46a163b019b0
parent: 811e20f0d94e72fd1b9b8b6f163a9e99af6f7a01
parent: f26c7e3f4f8bcabc0b92fbd042803ef320177b51
author: zhilwang <[email protected]>
date: Fri Jul 18 12:59:28 EDT 2014
Merge pull request #1194 from mstorsjo/msvc-simplify-output-dirs Use macros for setting the output directory in MSVC project files
--- a/codec/build/win32/dec/WelsDecCore.vcproj
+++ b/codec/build/win32/dec/WelsDecCore.vcproj
@@ -23,7 +23,7 @@
<Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -95,7 +95,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -168,7 +168,7 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -238,7 +238,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
--- a/codec/build/win32/dec/WelsDecPlus.vcproj
+++ b/codec/build/win32/dec/WelsDecPlus.vcproj
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -106,7 +106,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -192,7 +192,7 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -274,7 +274,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
--- a/codec/build/win32/dec/decConsole.vcproj
+++ b/codec/build/win32/dec/decConsole.vcproj
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -103,7 +103,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -186,7 +186,7 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -268,7 +268,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
--- a/codec/build/win32/enc/WelsEncCore.vcproj
+++ b/codec/build/win32/enc/WelsEncCore.vcproj
@@ -23,7 +23,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -95,7 +95,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -168,7 +168,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -243,7 +243,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
--- a/codec/build/win32/enc/WelsEncPlus.vcproj
+++ b/codec/build/win32/enc/WelsEncPlus.vcproj
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -105,7 +105,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -190,7 +190,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -279,7 +279,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
--- a/codec/build/win32/enc/encConsole.vcproj
+++ b/codec/build/win32/enc/encConsole.vcproj
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -104,7 +104,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -188,7 +188,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -273,7 +273,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
--- a/codec/processing/build/win32/WelsVP.vcproj
+++ b/codec/processing/build/win32/WelsVP.vcproj
@@ -24,7 +24,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -104,7 +104,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -185,7 +185,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -272,7 +272,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Release"
+ OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"