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

[Rafaël Carré]

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

contrib: detect mingw-w64 (as opposed to mingw.org)
(cherry picked from commit 521f40906c11615b9da6fabb19870724b91769fb)

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=1543b6a1ad983862465fb120a2850efa15ddb575
---

 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 afc9126..96d3481 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -148,6 +148,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