diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2010-07-11 22:31:41 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-06-02 19:25:58 -0400 |
| commit | b061ee9a5d68aa9f619ae8028171018940f07471 (patch) | |
| tree | ed24ea0df85ee959fd480ad47b4138bfdc98ae6f | |
| parent | baba561c0b0ee449837f727df5f88c038b7d2569 (diff) | |
| download | ffmpeg-b061ee9a5d68aa9f619ae8028171018940f07471.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
(cherry picked from commit e26011d0f495de1148b8014995cbe923611b6b76)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1611,10 +1611,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 |