ref: aafa6e3e5372a1ea4bb781a3f73c38da4edc1a0b
parent: 4354371b4e90c46222979090cad1ba75295ab60b
author: Martin Storsjö <[email protected]>
date: Fri Apr 11 07:17:20 EDT 2014
Reorder sections in encConsole.vcproj The MSVC GUI seems to want to write the file with data in the order Debug|Win32, Debug|x64, Release|Win32, Release|x64. This causes a large number of changes in the git diff even though the content still basically is the same. Therefore do it in a separate commit, to make sure that any later actual changes stay minimal.
--- a/codec/build/win32/enc/encConsole.vcproj
+++ b/codec/build/win32/enc/encConsole.vcproj
@@ -110,9 +110,9 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\..\..\..\..\bin\win32\Release"
- IntermediateDirectory=".\..\..\..\obj\encConsole\Release"
+ Name="Debug|x64"
+ OutputDirectory=".\..\..\..\..\bin\win64\Debug"
+ IntermediateDirectory=".\..\..\..\obj\encConsole\Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -133,22 +133,22 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\..\..\..\..\bin\Release/encConsole.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\..\..\..\..\bin\Debug/encConsole.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
- PreprocessorDefinitions="NDEBUG;_CONSOLE;X86_ASM;"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\..\..\..\obj\encConsole\Release/encConsole.pch"
- AssemblerListingLocation=".\..\..\..\obj\encConsole\Release/"
- ObjectFile=".\..\..\..\obj\encConsole\Release/"
- ProgramDataBaseFileName=".\..\..\..\obj\encConsole\Release/"
+ PreprocessorDefinitions="_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=".\..\..\..\obj\encConsole\Debug/encConsole.pch"
+ AssemblerListingLocation=".\..\..\..\obj\encConsole\Debug/"
+ ObjectFile=".\..\..\..\obj\encConsole\Debug/"
+ ProgramDataBaseFileName=".\..\..\..\obj\encConsole\Debug/"
WarningLevel="3"
DebugInformationFormat="3"
/>
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -167,16 +167,16 @@
Name="VCLinkerTool"
AdditionalDependencies="$(OutDir)\welsenc.lib"
OutputFile="$(OutDir)\encConsole.exe"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\bin"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
- GenerateMapFile="false"
- MapExports="false"
+ GenerateMapFile="true"
+ MapFileName="$(OutDir)\encConsole.map"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -202,9 +202,9 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory=".\..\..\..\..\bin\win64\Debug"
- IntermediateDirectory=".\..\..\..\obj\encConsole\Debug"
+ Name="Release|Win32"
+ OutputDirectory=".\..\..\..\..\bin\win32\Release"
+ IntermediateDirectory=".\..\..\..\obj\encConsole\Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -225,22 +225,22 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\..\..\..\..\bin\Debug/encConsole.tlb"
+ TypeLibraryName=".\..\..\..\..\..\bin\Release/encConsole.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\api\svc,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
- PreprocessorDefinitions="_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\..\..\..\obj\encConsole\Debug/encConsole.pch"
- AssemblerListingLocation=".\..\..\..\obj\encConsole\Debug/"
- ObjectFile=".\..\..\..\obj\encConsole\Debug/"
- ProgramDataBaseFileName=".\..\..\..\obj\encConsole\Debug/"
+ PreprocessorDefinitions="NDEBUG;_CONSOLE;X86_ASM;"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\..\..\..\obj\encConsole\Release/encConsole.pch"
+ AssemblerListingLocation=".\..\..\..\obj\encConsole\Release/"
+ ObjectFile=".\..\..\..\obj\encConsole\Release/"
+ ProgramDataBaseFileName=".\..\..\..\obj\encConsole\Release/"
WarningLevel="3"
DebugInformationFormat="3"
/>
@@ -249,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -259,16 +259,16 @@
Name="VCLinkerTool"
AdditionalDependencies="$(OutDir)\welsenc.lib"
OutputFile="$(OutDir)\encConsole.exe"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\bin"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\encConsole.pdb"
- GenerateMapFile="true"
- MapFileName="$(OutDir)\encConsole.map"
+ GenerateMapFile="false"
+ MapExports="false"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="2"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"