[vlc-commits] contrib: detect mingw-w64 (as opposed to mingw.org)

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Feb  2 18:23:20 2012 -0500| [521f40906c11615b9da6fabb19870724b91769fb] | committer: Rafaël Carré

contrib: detect mingw-w64 (as opposed to mingw.org)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=521f40906c11615b9da6fabb19870724b91769fb
---

 contrib/src/main.mak |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 3a9d2a3..5de6d55 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -147,6 +147,12 @@ endif
 
 endif
 
+ifdef HAVE_WIN32
+ifneq ($(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E __MINGW64_VERSION_MAJOR),)
+HAVE_MINGW_W64 := 1
+endif
+endif
+
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include