summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2016-07-21 00:04:35 +0300
committerMartin Storsjö <martin@martin.st>2016-07-26 09:29:38 +0300
commit79fb0692992c74214c6cf8e81350fc93eeffc5ec (patch)
tree508d6fec7283ffb7d1b167d8522a0ef1cf59122f
parent56af0bc10f49654b5b5f3efe82c69a13bf15fc8b (diff)
downloadffmpeg-79fb0692992c74214c6cf8e81350fc93eeffc5ec.tar.gz
configure: Move defines for controlling MSVCRT headers to the CRT detection section
This allows these flags to be automatically enabled for clang, when using MSVCRT headers. Signed-off-by: Martin Storsjö <martin@martin.st>
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 6f5daefc36..a41c1e8f8e 100755
--- a/configure
+++ b/configure
@@ -3239,7 +3239,6 @@ probe_cc(){
_ld_lib='lib%.a'
_ld_path='-libpath:'
_flags='-nologo'
- _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS'
elif $_cc 2>&1 | grep -q Intel; then
_type=icl
_ident=$($_cc 2>&1 | head -n1)
@@ -3262,7 +3261,7 @@ probe_cc(){
_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 -Qms0 -Qvec- -Qsimd- -GS'
+ _cflags='-Qms0 -Qvec- -Qsimd- -GS'
elif $_cc --version 2>/dev/null | grep -q ^cparser; then
_type=cparser
_ident=$($_cc --version | head -n1)
@@ -3989,6 +3988,7 @@ probe_libc(){
vsnprintf=avpriv_vsnprintf
fi
fi
+ add_${pfx}cppflags -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS
# The MSVC 2010 headers (Win 7.0 SDK) set _WIN32_WINNT to
# 0x601 by default unless something else is set by the user.
# This can easily lead to us detecting functions only present