summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-22 16:30:29 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-22 16:30:37 +0200
commitc1692439e081dcc259489a1c2ddc2a659870dce6 (patch)
tree8dd147f4277f59305cb82b6ca3cfbacb3dcaba8e /Makefile
parentc7e6443441ed5c1b5f64067dfbf4956bc2c6acbb (diff)
parent3ae0e721c7b6e0483801b9039b3d140e3b68b7f5 (diff)
downloadffmpeg-streaming-c1692439e081dcc259489a1c2ddc2a659870dce6.zip
ffmpeg-streaming-c1692439e081dcc259489a1c2ddc2a659870dce6.tar.gz
Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'
* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5': checkasm: Always link statically Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1fb1610..4e788cd 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ include $(SRC_PATH)/common.mak
FF_EXTRALIBS := $(FFEXTRALIBS)
FF_DEP_LIBS := $(DEP_LIBS)
+FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
all: $(AVPROGS)
OpenPOWER on IntegriCloud