Merge commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Jun 2013 08:16:42 +0000 (10:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Jun 2013 08:16:42 +0000 (10:16 +0200)
* commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28':
  configure: Separate commonalities in msvc and icl flags

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -2674,6 -2366,30 +2674,31 @@@ msvc_common_flags()
      done
  }
  
+ msvc_flags(){
+     msvc_common_flags "$@"
+     for flag; do
+         case $flag in
+             -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389 \
+                                        -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
+                                        -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
++                                       -wd4554 \
+                                        -wd4996 -wd4273 ;;
+         esac
+     done
+ }
+ icl_flags(){
+     msvc_common_flags "$@"
+     for flag; do
+         case $flag in
+             # Despite what Intel's documentation says -Wall, which is supported
+             # on Windows, does enable remarks so disable them here.
+             -Wall)                echo $flag -Qdiag-disable:remark ;;
+             -std=c99)             echo -Qstd=c99 ;;
+         esac
+     done
+ }
  pgi_flags(){
      for flag; do
          case $flag in