diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-12-02 00:12:57 -0500 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-12-08 01:00:36 +0100 |
| commit | 120797e2ef0ca317daf63ad79be5f72f835e9ac2 (patch) | |
| tree | 4e91d564bd5a9ee4dd787a4320fc35435a6f1039 | |
| parent | 9aa053ceded5550b2e538578af383fd89d82364c (diff) | |
| download | ffmpeg-120797e2ef0ca317daf63ad79be5f72f835e9ac2.tar.gz | |
configure: Separate MinGW32 and MinGW64 libc handling
| -rwxr-xr-x | configure | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -3386,12 +3386,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__ elif check_cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then libc_type=msvcrt |