[vlc-devel] [PATCH v2 05/13] contrib: detect mingw-w64 8.0

Steve Lhomme robux4 at ycbcr.xyz
Tue Jul 7 08:29:26 CEST 2020


It contains a lot of things we don't need to build anymore. It's found in
recent msys2 or our Docker images.
---
 contrib/src/main.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 3119a398759..1df4e52bd2f 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -156,6 +156,8 @@ LN_S = ln -s
 ifdef HAVE_WIN32
 ifneq ($(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E __MINGW64_VERSION_MAJOR),)
 HAVE_MINGW_W64 := 1
+MINGW_W64_VER := $(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E 'define\s__MINGW64_VERSION_MAJOR' | sed -e 's/\#define\s__MINGW64_VERSION_MAJOR\s//')
+HAVE_MINGW64_VER8 := $(shell [ $(MINGW_W64_VER) -gt 7 ] && echo true)
 endif
 ifndef HAVE_CROSS_COMPILE
 LN_S = cp -R
-- 
2.26.2



More information about the vlc-devel mailing list