Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 11:45:39 +0000 (13:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 11:45:46 +0000 (13:45 +0200)
* qatar/master:
  configure: More msvc/icl combining

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

index c29c220422b315e485b5dc8549e29ca5db15d739..3c2b19630fa15d3417bccd558e7ac788efe7bd1f 100755 (executable)
--- a/configure
+++ b/configure
@@ -4423,14 +4423,14 @@ elif enabled tms470; then
     add_cflags -pds=824 -pds=837
 elif enabled pathscale; then
     add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
-elif enabled msvc; then
+elif enabled_any msvc icl; then
     enabled x86_32 && disable aligned_stack
-elif enabled icl; then
-    enabled x86_32 && disable aligned_stack
-    # basically -fstrict-aliasing for icl that doesn't work (correctly) on 13.x+
-    check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias
-    # icl will pass the inline asm tests but inline asm is currently not supported (build will fail)
-    disable inline_asm
+    if enabled icl; then
+        # basically -fstrict-aliasing for icl that doesn't work (correctly) on 13.x+
+        check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias
+        # icl will pass the inline asm tests but inline asm is currently not supported (build will fail)
+        disable inline_asm
+    fi
 fi
 
 case $target_os in