ref: 019fb9e20e4cb567d8739a36cb003181c3b0c833
parent: 0cafc565becf6e6b02abbdf0865960b65f8e3b21
parent: e5eed1f65bc45d17beed00df016319408247034a
author: huili2 <huili2@cisco.com>
date: Thu Jul 10 09:50:48 EDT 2014
Merge pull request #1132 from mstorsjo/unify-encoder-opts Unify optimization options within the encoder MSVC projects
--- a/codec/build/win32/enc/WelsEncPlus.vcproj
+++ b/codec/build/win32/enc/WelsEncPlus.vcproj
@@ -225,7 +225,6 @@
Optimization="3"
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
- EnableFiberSafeOptimizations="true"
AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
StringPooling="true"
@@ -318,7 +317,6 @@
Optimization="3"
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
- EnableFiberSafeOptimizations="true"
AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
StringPooling="true"
--- a/codec/processing/build/win32/WelsVP.vcproj
+++ b/codec/processing/build/win32/WelsVP.vcproj
@@ -216,11 +216,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
+ InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common"
PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="false"
+ EnableFunctionLevelLinking="true"
WarningLevel="3"
DebugInformationFormat="3"
/>
@@ -245,8 +247,6 @@
MapFileName=""
MapExports="false"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
@@ -304,11 +304,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
+ InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common"
PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="false"
+ EnableFunctionLevelLinking="true"
WarningLevel="3"
DebugInformationFormat="3"
/>
@@ -333,8 +335,6 @@
MapFileName=""
MapExports="false"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool