[FFmpeg-cvslog] configure: icl: Merge -Qdiag-error parameters

Alex Smith git at videolan.org
Sat Jun 1 10:32:29 CEST 2013


ffmpeg | branch: master | Alex Smith <alex.smith at warpsharp.info> | Thu May 30 20:11:21 2013 +0000| [60f09c04d80a31126f7eeaa669280887c5f4bc71] | committer: Derek Buitenhuis

configure: icl: Merge -Qdiag-error parameters

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60f09c04d80a31126f7eeaa669280887c5f4bc71
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 897e1ed..73f4cd8 100755
--- a/configure
+++ b/configure
@@ -2619,7 +2619,7 @@ probe_cc(){
         _ld_lib='lib%.a'
         _ld_path='-libpath:'
         # -Qdiag-error to make icl error when presented with certain unknown arguments
-        _flags='-nologo -Qdiag-error:10157 -Qdiag-error:4044'
+        _flags='-nologo -Qdiag-error:4044,10157'
         # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency with msvc which enables it by default
         _cflags='-D_USE_MATH_DEFINES -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS'
         if [ $pfx = hostcc ]; then



More information about the ffmpeg-cvslog mailing list