diff options
author | Mans Rullgard <mans@mansr.com> | 2012-08-28 16:24:09 +0100 |
---|---|---|
committer | Mans Rullgard <mans@mansr.com> | 2012-08-28 23:40:30 +0100 |
commit | 7baa115a33ab516c85ac94f6c5cdaee73e65ddf8 (patch) | |
tree | aa4e40501185df89a54c4ed9865e96c5fc3389fd | |
parent | 095792f25351fbbaeb29504ae0a5d15c3f4b41d7 (diff) | |
download | ffmpeg-7baa115a33ab516c85ac94f6c5cdaee73e65ddf8.tar.gz |
build: export filtered -lz flag in config.mak
This is needed to link tools/cws2fws using a linker with non-standard
command line syntax.
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | configure | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -93,7 +93,7 @@ all: $(PROGS) $(TOOLS): %$(EXESUF): %.o $(LD) $(LDFLAGS) $(LD_O) $< $(ELIBS) -tools/cws2fws$(EXESUF): ELIBS = -lz +tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) config.h: .config .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) @@ -3561,6 +3561,7 @@ TARGET_EXEC=$target_exec TARGET_PATH=$target_path LIBS-avplay=$sdl_libs CFLAGS-avplay=$sdl_cflags +ZLIB=$($ldflags_filter -lz) LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD EXTRALIBS=$extralibs INSTALL=install |