diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-08 19:00:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-08 19:01:02 +0100 |
| commit | 1b264607883e7d52a3941cd9c192e3045096acc9 (patch) | |
| tree | a195b65abeb3096b8c11e480e4f46f64fd099dbd | |
| parent | c1b9d7189d3fee48a4439f27a565373fdb96b2d2 (diff) | |
| parent | 120797e2ef0ca317daf63ad79be5f72f835e9ac2 (diff) | |
| download | ffmpeg-1b264607883e7d52a3941cd9c192e3045096acc9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Separate MinGW32 and MinGW64 libc handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -3821,12 +3821,15 @@ elif check_cpp_condition features.h "defined __GLIBC__"; then elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then libc_type=newlib add_cppflags -U__STRICT_ANSI__ -elif check_header _mingw.h; then - libc_type=mingw - check_cpp_condition _mingw.h \ - "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) || \ - (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" || - die "ERROR: MinGW runtime version must be >= 3.15." +# 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 + add_cppflags -U__STRICT_ANSI__ +elif check_cpp_condition _mingw.h "defined __MINGW32_VERSION"; then + libc_type=mingw32 + check_cpp_condition _mingw.h "__MINGW32_MAJOR_VERSION > 3 || \ + (__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 |