RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

configure: Move MinGW64 specific check to the correct place 

It was misplaced during merge of commit 120797e2ef

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer 2013-12-08 16:13:07 -03:00 committed by Michael Niedermayer
parent 5f302b1f38
commit 0cde2ae3f1
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -3824,6 +3824,12 @@ elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
# MinGW64 is backwards compatible with MinGW32, so check for it first.
elif check_cpp_condition _mingw.h "defined __MINGW64_VERSION_MAJOR"; then
libc_type=mingw64
if check_cpp_condition _mingw.h "__MINGW64_VERSION_MAJOR < 3"; then
add_compat msvcrt/snprintf.o
add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
else
add_cppflags -D__USE_MINGW_ANSI_STDIO=1
fi
add_cppflags -U__STRICT_ANSI__
elif check_cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
libc_type=mingw32
@ -3831,13 +3837,6 @@ elif check_cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
(__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
die "ERROR: MinGW32 runtime version must be >= 3.15."
add_cppflags -U__STRICT_ANSI__
if check_cpp_condition _mingw.h "defined(__MINGW64_VERSION_MAJOR) && \
__MINGW64_VERSION_MAJOR < 3"; then
add_compat msvcrt/snprintf.o
add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
else
add_cppflags -D__USE_MINGW_ANSI_STDIO=1
fi
elif check_cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then
libc_type=msvcrt
add_compat strtod.o strtod=avpriv_strtod