mirror of https://git.ffmpeg.org/ffmpeg.git
build: add -L flags before existing LDFLAGS
This ensures the linker picks the just built libraries even if LDFLAGS for some reason contains -L flags pointing at other directories containing libav libraries. Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
parent
2cc4f3b21f
commit
371584c42b
6
Makefile
6
Makefile
|
@ -20,13 +20,15 @@ $(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
|
|||
$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_PATH)/%=%)); $(INSTALL))
|
||||
endif
|
||||
|
||||
ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
|
||||
|
||||
IFLAGS := -I. -I$(SRC_PATH)
|
||||
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
|
||||
CFLAGS += $(ECFLAGS)
|
||||
CCFLAGS = $(CFLAGS)
|
||||
YASMFLAGS += $(IFLAGS) -Pconfig.asm
|
||||
HOSTCFLAGS += $(IFLAGS)
|
||||
LDFLAGS += $(ALLFFLIBS:%=-Llib%)
|
||||
LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
|
||||
|
||||
define COMPILE
|
||||
$($(1)DEP)
|
||||
|
@ -66,8 +68,6 @@ BASENAMES = ffmpeg ffplay ffprobe ffserver
|
|||
ALLPROGS = $(BASENAMES:%=%$(EXESUF))
|
||||
ALLMANPAGES = $(BASENAMES:%=%.1)
|
||||
|
||||
ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
|
||||
|
||||
FFLIBS-$(CONFIG_AVDEVICE) += avdevice
|
||||
FFLIBS-$(CONFIG_AVFILTER) += avfilter
|
||||
FFLIBS-$(CONFIG_AVFORMAT) += avformat
|
||||
|
|
Loading…
Reference in New Issue