| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 12:35:47 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 12:35:52 (GMT) |
| commit | ab0b1fdd176c76d0d95adc7ceb85a1d8e585d667 (patch) | |
| tree | f7b481e31115e9df19f596d50ef2c7ca4600da08 | |
| parent | 17513f4fb3c012bc3147ae33cb2d2c9fc9a6e564 (diff) | |
| parent | d6d27f3e58e6980bce4a490e7d8cc0f6a84521fe (diff) | |
| download | ffmpeg-ab0b1fdd176c76d0d95adc7ceb85a1d8e585d667.zip ffmpeg-ab0b1fdd176c76d0d95adc7ceb85a1d8e585d667.tar.gz ffmpeg-ab0b1fdd176c76d0d95adc7ceb85a1d8e585d667.tar.bz2 | |
Merge commit 'd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe'
* commit 'd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe':
configure: Enable -Qansi-alias for icl 14+
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -4543,8 +4543,10 @@ elif enabled_any msvc icl; then enabled debug && add_ldflags -debug enable pragma_deprecated if enabled icl; then - # basically -fstrict-aliasing that does not work (correctly) on icl 13.x - check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias + # -Qansi-alias is basically -fstrict-aliasing, but does not work + # (correctly) on icl 13.x. + check_cpp_condition "windows.h" "__ICL < 1300 || __ICL >= 1400" && + add_cflags -Qansi-alias # icl will pass the inline asm tests but inline asm is currently # not supported (build will fail) disable inline_asm |