Move -Werror to platform file. Also, %zu can't be used on Windows.
This commit is contained in:
parent
50a74382f0
commit
b2066e1dc2
@ -9,5 +9,5 @@ before_install:
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -qq g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev
|
||||
install: make gtest-bootstrap
|
||||
script: make WERROR=Yes && make test && make clean && make WERROR=Yes ENABLE64BIT=Yes && make test
|
||||
script: make && make test && make clean && make ENABLE64BIT=Yes && make test
|
||||
|
||||
|
8
Makefile
8
Makefile
@ -17,10 +17,9 @@ ifneq ($(ENABLE64BIT), Yes)
|
||||
USE_ASM = Yes
|
||||
endif
|
||||
else
|
||||
CFLAGS += -g
|
||||
CFLAGS = -g
|
||||
USE_ASM = No
|
||||
endif
|
||||
|
||||
ifeq ($(ENABLE64BIT), Yes)
|
||||
CFLAGS += -m64
|
||||
LDFLAGS += -m64
|
||||
@ -28,11 +27,6 @@ else
|
||||
CFLAGS += -m32
|
||||
LDFLAGS += -m32
|
||||
endif
|
||||
|
||||
ifeq ($(WERROR), Yes)
|
||||
CFLAGS += -Werror
|
||||
endif
|
||||
|
||||
include build/platform-$(UNAME).mk
|
||||
|
||||
ifeq ($(USE_ASM),Yes)
|
||||
|
@ -1,5 +1,5 @@
|
||||
ASM = nasm
|
||||
CFLAGS += -fPIC -DLINUX -D__NO_CTYPE
|
||||
CFLAGS += -Werror -fPIC -DLINUX -D__NO_CTYPE
|
||||
LDFLAGS += -lpthread
|
||||
ASMFLAGS += -f elf
|
||||
|
||||
|
@ -2123,9 +2123,9 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar
|
||||
}
|
||||
|
||||
#if defined(MEMORY_MONITOR)
|
||||
WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %zu bytes\n",
|
||||
sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */
|
||||
+ pCtx->pMemAlign->WelsGetMemoryUsage() /* requested size from CMemoryAlign::WelsMalloc() */
|
||||
WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %u bytes\n",
|
||||
static_cast<unsigned int>(sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */
|
||||
+ pCtx->pMemAlign->WelsGetMemoryUsage()) /* requested size from CMemoryAlign::WelsMalloc() */
|
||||
);
|
||||
#endif//MEMORY_MONITOR
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user