generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the WelsThreadLib files to the common directory/library

Browse Source 
This simplifies building the thread library code via the
makefile based build system.
This commit is contained in:
Martin Storsjö 2014-01-21 12:03:14 +02:00
parent 249b4e3d1f
commit 68f32c3c29
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
codec/build/win32/enc/WelsEncCore.vcproj
View File

@ -52,7 +52,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api;" AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;X86_ASM;MT_ENABLED" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;X86_ASM;MT_ENABLED"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -132,7 +132,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api;" AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc;"
PreprocessorDefinitions="WIN64;_DEBUG;_LIB;X86_ASM;MT_ENABLED" PreprocessorDefinitions="WIN64;_DEBUG;_LIB;X86_ASM;MT_ENABLED"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -214,7 +214,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api" AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;X86_ASM;MT_ENABLED;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;X86_ASM;MT_ENABLED;"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -298,7 +298,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api" AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc"
PreprocessorDefinitions="WIN64;NDEBUG;_LIB;MT_ENABLED;X86_ASM" PreprocessorDefinitions="WIN64;NDEBUG;_LIB;MT_ENABLED;X86_ASM"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -1416,7 +1416,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\..\WelsThreadLib\src\WelsThreadLib.cpp" RelativePath="..\..\..\common\WelsThreadLib.cpp"
> >
</File> </File>
</Filter> </Filter>
@ -1649,7 +1649,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\WelsThreadLib\api\WelsThreadLib.h" RelativePath="..\..\..\common\WelsThreadLib.h"
> >
</File> </File>
</Filter> </Filter>

0
codec/WelsThreadLib/src/WelsThreadLib.cpp → codec/common/WelsThreadLib.cpp
View File

0
codec/WelsThreadLib/api/WelsThreadLib.h → codec/common/WelsThreadLib.h
View File

1
codec/common/targets.mk
View File

@ -4,6 +4,7 @@ COMMON_CPP_SRCS=\
$(COMMON_SRCDIR)/./cpu.cpp\ $(COMMON_SRCDIR)/./cpu.cpp\
$(COMMON_SRCDIR)/./deblocking_common.cpp\ $(COMMON_SRCDIR)/./deblocking_common.cpp\
$(COMMON_SRCDIR)/./logging.cpp\ $(COMMON_SRCDIR)/./logging.cpp\
$(COMMON_SRCDIR)/./WelsThreadLib.cpp\
COMMON_OBJS += $(COMMON_CPP_SRCS:.cpp=.o) COMMON_OBJS += $(COMMON_CPP_SRCS:.cpp=.o)
ifeq ($(USE_ASM), Yes) ifeq ($(USE_ASM), Yes)