From a15ad8cc80773b251f88798e364668cc175c0738 Mon Sep 17 00:00:00 2001 From: Ethan Hugg Date: Wed, 11 Dec 2013 09:52:02 -0800 Subject: [PATCH] Updated makefiles for new logging changes. --- codec/build/linux/dec/makefile | 13 ++++++++++--- codec/build/linux/enc/makefile | 15 +++++++++++---- codec/build/win32/dec/WelsDecPlus.vcproj | 4 ++-- codec/build/win32/dec/WelsDecPlus_2010.vcxproj | 4 ++-- codec/build/win32/dec/WelsDecPlus_2012.vcxproj | 4 ++-- codec/build/win32/dec/decConsole.vcproj | 8 ++++++-- codec/build/win32/dec/decConsole_2010.vcxproj | 5 +++-- codec/build/win32/dec/decConsole_2012.vcxproj | 5 +++-- codec/build/win32/enc/WelsEncPlus.vcproj | 4 ++-- codec/build/win32/enc/WelsEncPlus_2010.vcxproj | 4 ++-- codec/build/win32/enc/WelsEncPlus_2012.vcxproj | 4 ++-- codec/build/win32/enc/encConsole.vcproj | 8 ++++++-- codec/build/win32/enc/encConsole_2010.vcxproj | 5 +++-- codec/build/win32/enc/encConsole_2012.vcxproj | 5 +++-- codec/console/dec/src/h264dec.cpp | 1 + codec/console/enc/src/welsenc.cpp | 1 + 16 files changed, 59 insertions(+), 31 deletions(-) diff --git a/codec/build/linux/dec/makefile b/codec/build/linux/dec/makefile index f8bde8b8..a949b67b 100644 --- a/codec/build/linux/dec/makefile +++ b/codec/build/linux/dec/makefile @@ -7,11 +7,12 @@ DEPEND= dependencies BINDIR= ../bin OUTDIR= ../../../../bin/linux -INCLUDE= -I../../../api/svc -I../../../decoder/core/inc -I../../../decoder/plus/inc -I../../../console/dec/inc +INCLUDE= -I../../../api/svc -I../../../decoder/core/inc -I../../../decoder/plus/inc -I../../../console/dec/inc -I../../../common CORESRCDIR= ../../../decoder/core/src PLUSSRCDIR= ../../../decoder/plus/src ASMSRCDIR= ../../../decoder/core/asm MAINSRCDIR= ../../../console/dec/src +COMMONSRCDIR= ../../../common OBJMAINDIR= ../obj OBJDIR= ../obj/dec @@ -63,7 +64,8 @@ $(CORESRCDIR)/decode_slice.cpp \ $(CORESRCDIR)/decoder_core.cpp \ $(CORESRCDIR)/utils.cpp \ $(PLUSSRCDIR)/welsDecoderExt.cpp \ -$(PLUSSRCDIR)/welsCodecTrace.cpp +$(PLUSSRCDIR)/welsCodecTrace.cpp \ +$(COMMONSRCDIR)/logging.cpp ASMSRC= $(ASMSRCDIR)/block_add.asm \ $(ASMSRCDIR)/cpuid.asm \ @@ -103,7 +105,8 @@ $(OBJDIR)/decode_slice.o \ $(OBJDIR)/decoder_core.o \ $(OBJDIR)/utils.o \ $(OBJDIR)/welsDecoderExt.o \ -$(OBJDIR)/welsCodecTrace.o +$(OBJDIR)/welsCodecTrace.o \ +$(OBJDIR)/logging.o ifeq ($(NASM), 1) OBJDEC+=$(OBJDIR)/block_add.o \ @@ -241,6 +244,10 @@ $(OBJDIR)/%.o$(SUFFIX): $(ASMSRCDIR)/%.asm $(OBJDIR)/%.o$(SUFFIX): $(MAINSRCDIR)/%.cpp @echo 'compiling object file "$@" ...' @$(CC) -m32 -c $(CFLAGS) -o $@ $< + +$(OBJDIR)/%.o$(SUFFIX): $(COMMONSRCDIR)/%.cpp + @echo 'compiling object file "$@" ...' + @$(CC) -m32 -c $(CFLAGS) -o $@ $< include $(DEPEND) diff --git a/codec/build/linux/enc/makefile b/codec/build/linux/enc/makefile index a9a00cf9..b8a2c57f 100644 --- a/codec/build/linux/enc/makefile +++ b/codec/build/linux/enc/makefile @@ -7,12 +7,13 @@ DEPEND= dependencies OUTDIR= ../../../../bin/linux BINDIR= ../bin -INCLUDE= -I../../../encoder/core/inc -I../../../encoder/plus/inc -I../../../api/svc -I../../../WelsThreadLib/api -I../../../console/enc/inc +INCLUDE= -I../../../encoder/core/inc -I../../../encoder/plus/inc -I../../../api/svc -I../../../WelsThreadLib/api -I../../../console/enc/inc -I../../../common THREADLIBSRCDIR=../../../WelsThreadLib/src CORESRCDIR= ../../../encoder/core/src PLUSSRCDIR= ../../../encoder/plus/src ASMSRCDIR= ../../../encoder/core/asm MAINSRCDIR= ../../../console/enc/src +COMMONSRCDIR= ../../../common OBJMAINDIR= ../obj OBJDIR= ../obj/enc @@ -24,7 +25,7 @@ GCC = gcc -m32 ASFLAGS= -f elf -DNOPREFIX -I ../../../encoder/core/asm/ -LIBS= -lstdc++ -ldl -lpthread +LIBS= -lstdc++ -ldl -lpthread -lm #-lm CFLAGS= $(INCLUDE) -m32 -fPIC -D__GCC__ -DLINUX -D__NO_CTYPE -DWELS_SVC -DENCODER_CORE -DHAVE_CACHE_LINE_ALIGN -DWELS_TESTBED -DMT_ENABLED @@ -73,7 +74,8 @@ $(CORESRCDIR)/svc_set_mb_syn_cavlc.cpp \ $(CORESRCDIR)/utils.cpp \ $(THREADLIBSRCDIR)/WelsThreadLib.cpp \ $(PLUSSRCDIR)/welsEncoderExt.cpp \ -$(PLUSSRCDIR)/welsCodecTrace.cpp +$(PLUSSRCDIR)/welsCodecTrace.cpp \ +$(COMMONSRCDIR)/logging.cpp ASMSRC= $(ASMSRCDIR)/coeff.asm \ $(ASMSRCDIR)/cpuid.asm \ @@ -129,7 +131,8 @@ $(OBJDIR)/svc_set_mb_syn_cavlc.o \ $(OBJDIR)/utils.o \ $(OBJDIR)/WelsThreadLib.o \ $(OBJDIR)/welsEncoderExt.o \ -$(OBJDIR)/welsCodecTrace.o +$(OBJDIR)/welsCodecTrace.o \ +$(OBJDIR)/logging.o ifeq ($(NASM), 1) OBJENC += $(OBJDIR)/cpuid.o \ @@ -266,5 +269,9 @@ $(OBJDIR)/%.o$(SUFFIX): $(MAINSRCDIR)/%.cpp @echo 'compiling object file "$@" ...' @$(CC) -m32 -c $(CFLAGS) -o $@ $< +$(OBJDIR)/%.o$(SUFFIX): $(COMMONSRCDIR)/%.cpp + @echo 'compiling object file "$@" ...' + @$(CC) -m32 -c $(CFLAGS) -o $@ $< + include $(DEPEND) diff --git a/codec/build/win32/dec/WelsDecPlus.vcproj b/codec/build/win32/dec/WelsDecPlus.vcproj index 507baf8c..e530eb45 100644 --- a/codec/build/win32/dec/WelsDecPlus.vcproj +++ b/codec/build/win32/dec/WelsDecPlus.vcproj @@ -50,7 +50,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc" + AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN" StringPooling="true" RuntimeLibrary="2" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -116,7 +116,7 @@ Disabled - ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/codec/build/win32/dec/WelsDecPlus_2012.vcxproj b/codec/build/win32/dec/WelsDecPlus_2012.vcxproj index d7276a1f..04b9ac23 100644 --- a/codec/build/win32/dec/WelsDecPlus_2012.vcxproj +++ b/codec/build/win32/dec/WelsDecPlus_2012.vcxproj @@ -66,7 +66,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ Disabled - ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/codec/build/win32/dec/decConsole.vcproj b/codec/build/win32/dec/decConsole.vcproj index 4d96535a..524cffc0 100644 --- a/codec/build/win32/dec/decConsole.vcproj +++ b/codec/build/win32/dec/decConsole.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common\inc" + AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\api\svc,..\..\..\common" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="true" RuntimeLibrary="2" @@ -135,7 +135,7 @@ + + diff --git a/codec/build/win32/dec/decConsole_2010.vcxproj b/codec/build/win32/dec/decConsole_2010.vcxproj index a0e914d3..763d1906 100644 --- a/codec/build/win32/dec/decConsole_2010.vcxproj +++ b/codec/build/win32/dec/decConsole_2010.vcxproj @@ -62,7 +62,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common\inc;%(AdditionalIncludeDirectories) + ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -103,7 +103,7 @@ Disabled - ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common\inc;%(AdditionalIncludeDirectories) + ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -152,6 +152,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + diff --git a/codec/build/win32/dec/decConsole_2012.vcxproj b/codec/build/win32/dec/decConsole_2012.vcxproj index 6a635d16..60ce7fff 100644 --- a/codec/build/win32/dec/decConsole_2012.vcxproj +++ b/codec/build/win32/dec/decConsole_2012.vcxproj @@ -61,7 +61,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common\inc;%(AdditionalIncludeDirectories) + ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -102,7 +102,7 @@ Disabled - ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common\inc;%(AdditionalIncludeDirectories) + ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -143,6 +143,7 @@ + diff --git a/codec/build/win32/enc/WelsEncPlus.vcproj b/codec/build/win32/enc/WelsEncPlus.vcproj index 3a576fe5..688b23b1 100644 --- a/codec/build/win32/enc/WelsEncPlus.vcproj +++ b/codec/build/win32/enc/WelsEncPlus.vcproj @@ -49,7 +49,7 @@ Disabled - ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSENCPLUS_EXPORTS;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) true EnableFastChecks @@ -117,7 +117,7 @@ Speed true true - ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSENCPLUS_EXPORTS;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/codec/build/win32/enc/WelsEncPlus_2012.vcxproj b/codec/build/win32/enc/WelsEncPlus_2012.vcxproj index 3a41c079..d7ad4471 100644 --- a/codec/build/win32/enc/WelsEncPlus_2012.vcxproj +++ b/codec/build/win32/enc/WelsEncPlus_2012.vcxproj @@ -65,7 +65,7 @@ Disabled - ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSENCPLUS_EXPORTS;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) true EnableFastChecks @@ -116,7 +116,7 @@ Speed true true - ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSENCPLUS_EXPORTS;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/codec/build/win32/enc/encConsole.vcproj b/codec/build/win32/enc/encConsole.vcproj index c0706889..1aacf591 100644 --- a/codec/build/win32/enc/encConsole.vcproj +++ b/codec/build/win32/enc/encConsole.vcproj @@ -45,7 +45,7 @@ + + diff --git a/codec/build/win32/enc/encConsole_2010.vcxproj b/codec/build/win32/enc/encConsole_2010.vcxproj index ba4588a6..56a627b0 100644 --- a/codec/build/win32/enc/encConsole_2010.vcxproj +++ b/codec/build/win32/enc/encConsole_2010.vcxproj @@ -62,7 +62,7 @@ Disabled - ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common\inc;%(AdditionalIncludeDirectories) + ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;ENCODER_CORE;X86_ASM;MT_ENABLED;%(PreprocessorDefinitions) true EnableFastChecks @@ -105,7 +105,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common\inc;%(AdditionalIncludeDirectories) + ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;ENCODER_CORE;X86_ASM;MT_ENABLED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -155,6 +155,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + diff --git a/codec/build/win32/enc/encConsole_2012.vcxproj b/codec/build/win32/enc/encConsole_2012.vcxproj index 434225d6..31886aa5 100644 --- a/codec/build/win32/enc/encConsole_2012.vcxproj +++ b/codec/build/win32/enc/encConsole_2012.vcxproj @@ -61,7 +61,7 @@ Disabled - ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common\inc;%(AdditionalIncludeDirectories) + ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;ENCODER_CORE;X86_ASM;MT_ENABLED;%(PreprocessorDefinitions) true EnableFastChecks @@ -105,7 +105,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common\inc;%(AdditionalIncludeDirectories) + ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;ENCODER_CORE;X86_ASM;MT_ENABLED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -147,6 +147,7 @@ + diff --git a/codec/console/dec/src/h264dec.cpp b/codec/console/dec/src/h264dec.cpp index 418ed1d6..88f72a47 100644 --- a/codec/console/dec/src/h264dec.cpp +++ b/codec/console/dec/src/h264dec.cpp @@ -39,6 +39,7 @@ #endif #include #include +#include #include "codec_def.h" #include "codec_app_def.h" diff --git a/codec/console/enc/src/welsenc.cpp b/codec/console/enc/src/welsenc.cpp index 3faec4ce..bf5402c5 100644 --- a/codec/console/enc/src/welsenc.cpp +++ b/codec/console/enc/src/welsenc.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #ifdef ONLY_ENC_FRAMES_NUM #undef ONLY_ENC_FRAMES_NUM