diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2010-07-11 22:31:41 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2010-07-11 22:31:41 +0000 |
| commit | e26011d0f495de1148b8014995cbe923611b6b76 (patch) | |
| tree | 31cb5d25429e190dafcd8987a420cd9fa6280412 /configure | |
| parent | ec1ee802a2e1cb3317bd44851cc28f95b5916051 (diff) | |
| download | ffmpeg-e26011d0f495de1148b8014995cbe923611b6b76.tar.gz | |
mingw32: merge checks for mingw-w64 and mingw32-runtime >= 3.15 into one
Originally committed as revision 24204 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -2271,10 +2271,9 @@ case $target_os in objformat="win32" enable dos_paths check_cflags -fno-common - if ! check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR)"; then - check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" || + 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." - fi ;; cygwin*) target_os=cygwin |