ref: c7f1974ef7a4b8e7cd8215c002c776326b0f0ff0
parent: 77fd9aa4f0d9eabdf5073911cbbca2449b7522b9
author: licaiguo <[email protected]>
date: Thu Jan 9 11:05:23 EST 2014
update vs2010 files
--- a/codec/build/win32/dec/WelsDecCore_2010.vcxproj
+++ b/codec/build/win32/dec/WelsDecCore_2010.vcxproj
@@ -253,6 +253,7 @@
<ClInclude Include="..\..\..\common\cpu.h" />
<ClInclude Include="..\..\..\common\cpu_core.h" />
<ClInclude Include="..\..\..\common\logging.h" />
+ <ClInclude Include="..\..\..\common\macros.h" />
<ClInclude Include="..\..\..\common\typedefs.h" />
<ClInclude Include="..\..\..\decoder\core\inc\as264_common.h" />
<ClInclude Include="..\..\..\decoder\core\inc\au_parser.h" />
@@ -266,7 +267,6 @@
<ClInclude Include="..\..\..\decoder\core\inc\fmo.h" />
<ClInclude Include="..\..\..\decoder\core\inc\get_intra_predictor.h" />
<ClInclude Include="..\..\..\decoder\core\inc\ls_defines.h" />
- <ClInclude Include="..\..\..\decoder\core\inc\macros.h" />
<ClInclude Include="..\..\..\decoder\core\inc\manage_dec_ref.h" />
<ClInclude Include="..\..\..\decoder\core\inc\mb_cache.h" />
<ClInclude Include="..\..\..\decoder\core\inc\mc.h" />
--- a/codec/build/win32/dec/WelsDecCore_2010.vcxproj.filters
+++ b/codec/build/win32/dec/WelsDecCore_2010.vcxproj.filters
@@ -123,9 +123,6 @@
<ClInclude Include="..\..\..\decoder\core\inc\ls_defines.h">
<Filter>headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\decoder\core\inc\macros.h">
- <Filter>headers</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\decoder\core\inc\manage_dec_ref.h">
<Filter>headers</Filter>
</ClInclude>
@@ -190,6 +187,9 @@
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\common\typedefs.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\common\macros.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>
--- a/codec/build/win32/enc/WelsEncCore_2010.vcxproj
+++ b/codec/build/win32/enc/WelsEncCore_2010.vcxproj
@@ -126,7 +126,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\common;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;_DEBUG;X86_ASM;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -160,7 +160,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\common;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WELS_SVC;ENCODER_CORE;X86_ASM;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -196,7 +196,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\common;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;NDEBUG;X86_ASM;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -498,6 +498,7 @@
<ItemGroup>
<ClInclude Include="..\..\..\common\cpu.h" />
<ClInclude Include="..\..\..\common\cpu_core.h" />
+ <ClInclude Include="..\..\..\common\macros.h" />
<ClInclude Include="..\..\..\common\typedefs.h" />
<ClInclude Include="..\..\..\encoder\core\inc\array_stack_align.h" />
<ClInclude Include="..\..\..\encoder\core\inc\as264_common.h" />
@@ -513,7 +514,6 @@
<ClInclude Include="..\..\..\encoder\core\inc\extern.h" />
<ClInclude Include="..\..\..\encoder\core\inc\get_intra_predictor.h" />
<ClInclude Include="..\..\..\encoder\core\inc\ls_defines.h" />
- <ClInclude Include="..\..\..\encoder\core\inc\macros.h" />
<ClInclude Include="..\..\..\encoder\core\inc\mb_cache.h" />
<ClInclude Include="..\..\..\encoder\core\inc\mc.h" />
<ClInclude Include="..\..\..\encoder\core\inc\md.h" />
--- a/codec/build/win32/enc/WelsEncCore_2010.vcxproj.filters
+++ b/codec/build/win32/enc/WelsEncCore_2010.vcxproj.filters
@@ -147,9 +147,6 @@
<ClInclude Include="..\..\..\encoder\core\inc\ls_defines.h">
<Filter>headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\encoder\core\inc\macros.h">
- <Filter>headers</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\encoder\core\inc\mb_cache.h">
<Filter>headers</Filter>
</ClInclude>
@@ -277,6 +274,9 @@
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\common\typedefs.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\common\macros.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>