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
This commit is contained in:
parent
ec1ee802a2
commit
e26011d0f4
5
configure
vendored
5
configure
vendored
@ -2271,10 +2271,9 @@ case $target_os in
|
|||||||
objformat="win32"
|
objformat="win32"
|
||||||
enable dos_paths
|
enable dos_paths
|
||||||
check_cflags -fno-common
|
check_cflags -fno-common
|
||||||
if ! check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR)"; then
|
check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) \
|
||||||
check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
|
|| (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
|
||||||
die "ERROR: MinGW runtime version must be >= 3.15."
|
die "ERROR: MinGW runtime version must be >= 3.15."
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
cygwin*)
|
cygwin*)
|
||||||
target_os=cygwin
|
target_os=cygwin
|
||||||
|
Loading…
x
Reference in New Issue
Block a user