[vlc-commits] contrib: detect mingw-w64 8.0
Steve Lhomme
git at videolan.org
Thu Jul 9 14:23:32 CEST 2020
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul 6 10:43:51 2020 +0200| [02be325fa6f5d7780253e2c3eebf95b6f8ed1d69] | committer: Steve Lhomme
contrib: detect mingw-w64 8.0
It contains a lot of things we don't need to build anymore. It's found in
recent msys2 or our Docker images.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02be325fa6f5d7780253e2c3eebf95b6f8ed1d69
---
contrib/src/main.mak | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 3119a39875..4ade7b799b 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_VERSION := $(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_V8 := $(shell [ $(MINGW_W64_VERSION) -gt 7 ] && echo true)
endif
ifndef HAVE_CROSS_COMPILE
LN_S = cp -R
More information about the vlc-commits
mailing list