mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '2575b1917b2703fae41a4b4901ad85c888374dfd'
* commit '2575b1917b2703fae41a4b4901ad85c888374dfd': build: Add separate flags for checkheaders targets Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
d14a1bd8e4
|
@ -136,6 +136,7 @@ ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)
|
|||
SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
|
||||
SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
|
||||
HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o))
|
||||
$(HOBJS): CCFLAGS += $(CFLAGS_HEADERS)
|
||||
checkheaders: $(HOBJS)
|
||||
.SECONDARY: $(HOBJS:.o=.c)
|
||||
|
||||
|
|
|
@ -6143,6 +6143,14 @@ check_disable_warning -Wno-format-zero-length
|
|||
check_disable_warning -Wno-pointer-sign
|
||||
check_disable_warning -Wno-unused-const-variable
|
||||
|
||||
check_disable_warning_headers(){
|
||||
warning_flag=-W${1#-Wno-}
|
||||
test_cflags $warning_flag && append cflags_headers $1
|
||||
}
|
||||
|
||||
check_disable_warning_headers -Wno-deprecated-declarations
|
||||
check_disable_warning_headers -Wno-unused-variable
|
||||
|
||||
# add some linker flags
|
||||
check_ldflags -Wl,--warn-common
|
||||
check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
|
||||
|
@ -6742,6 +6750,7 @@ TARGET_EXEC=$target_exec $target_exec_args
|
|||
TARGET_PATH=$target_path
|
||||
TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
|
||||
CFLAGS-ffplay=${sdl2_cflags}
|
||||
CFLAGS_HEADERS=$cflags_headers
|
||||
ZLIB=$($ldflags_filter -lz)
|
||||
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
|
||||
EXTRALIBS=$extralibs
|
||||
|
|
Loading…
Reference in New Issue