aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2010-07-10 04:08:02 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-06-02 19:25:12 -0400
commit68d2c6e872d2d063ff0642399524e6e804039f9c (patch)
tree3e5b02171204f865d39c9f662aaef03af201d593
parent4bccd5a36bb14d9befecdc10cd8c4c4a5d3d24fe (diff)
downloadffmpeg-68d2c6e872d2d063ff0642399524e6e804039f9c.tar.gz
configure: properly check for mingw-w64 through installed headers. mingw-w64 can also target 32-bit code.
Originally committed as revision 24156 to svn://svn.ffmpeg.org/ffmpeg/trunk (cherry picked from commit 0a4307d6307516d333ce2cde2a2ffa0f50bc176c) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index b3e2fe1489..1474ddbdc0 100755
--- a/configure
+++ b/configure
@@ -2230,7 +2230,7 @@ case $target_os in
dlltool="${cross_prefix}dlltool"
enable dos_paths
check_cflags -fno-common
- if ! enabled x86_64; then
+ 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)" ||
die "ERROR: MinGW runtime version must be >= 3.15."
enabled_any avisynth vfwcap_indev &&