diff options
| author | James Almer <jamrial@gmail.com> | 2013-12-08 16:13:07 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 02:06:21 +0100 |
| commit | 0cde2ae3f1143547ebce0134fcaa559b8629de88 (patch) | |
| tree | 6338cf06b1cd684cd5aff88c383ae93bf97dfbaf /configure | |
| parent | 5f302b1f3819f603349a921458197fa5c35dc396 (diff) | |
| download | ffmpeg-0cde2ae3f1143547ebce0134fcaa559b8629de88.tar.gz | |
configure: Move MinGW64 specific check to the correct place
It was misplaced during merge of commit 120797e2ef0ca317daf63ad79be5f72f835e9ac2
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -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 |