summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-09-12 12:57:08 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-09-12 12:57:23 (GMT)
commit07f6a3d7873404d3600c536c02fbbda2d6dc0652 (patch)
treeb528c07b0a557082d254b6bff54ee371ea356149
parentfa9e8bafc832dc934ea0b7861e341b948289419c (diff)
parente2cd766ca1b9bb2ba72aca5f6ba5d8be15743984 (diff)
downloadffmpeg-07f6a3d7873404d3600c536c02fbbda2d6dc0652.zip
ffmpeg-07f6a3d7873404d3600c536c02fbbda2d6dc0652.tar.gz
ffmpeg-07f6a3d7873404d3600c536c02fbbda2d6dc0652.tar.bz2
Merge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984'
* commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984': configure: Mention that icl does not build both static and shared libs Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 4ff97b4..8fee6a5 100755
--- a/configure
+++ b/configure
@@ -3552,7 +3552,7 @@ case $target_os in
# Link to the import library instead of the normal static library
# for shared libs.
LD_LIB='%.lib'
- # Cannot build shared and static libs at the same time with MSVC.
+ # Cannot build both shared and static libs with MSVC or icl.
disable static
fi
shlibdir_default="$bindir_default"