[FFmpeg-cvslog] configure: properly check for mingw-w64 through installed headers. mingw-w64 can also target 32-bit code.

Ramiro Polla git at videolan.org
Mon Jun 4 12:51:32 CEST 2012


ffmpeg | branch: release/0.6 | Ramiro Polla <ramiro.polla at gmail.com> | Sat Jul 10 04:08:02 2010 +0000| [68d2c6e872d2d063ff0642399524e6e804039f9c] | committer: Derek Buitenhuis

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68d2c6e872d2d063ff0642399524e6e804039f9c
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index b3e2fe1..1474ddb 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 &&



More information about the ffmpeg-cvslog mailing list