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
(cherry picked from commit e26011d0f495de1148b8014995cbe923611b6b76)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Ramiro Polla 2010-07-11 22:31:41 +00:00 committed by Derek Buitenhuis
parent 732dbc0f03
commit 77630b68e5

5
configure vendored
View File

@ -2230,10 +2230,9 @@ case $target_os in
dlltool="${cross_prefix}dlltool"
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