[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: slighty faster to get the mingw-w64 major version

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
4f73bdde by Steve Lhomme at 2022-03-09T09:22:52+00:00
contrib: slighty faster to get the mingw-w64 major version

It doesn't involve grep nor sed.

Co-authored-by: Stephen Kitt <steve at sk2.org>

- - - - -
b68cc907 by Steve Lhomme at 2022-03-09T09:22:52+00:00
contrib: pthreads: add missing eventtoken.h needed by windows.storage.h

It's not available in older mingw-w64 versions

- - - - -


2 changed files:

- contrib/src/main.mak
- contrib/src/pthreads/rules.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -127,7 +127,7 @@ endif
 
 LN_S = ln -s
 ifdef HAVE_WIN32
-MINGW_W64_VERSION := $(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E -m 1 __MINGW64_VERSION_MAJOR | sed -e 's/\#define\s__MINGW64_VERSION_MAJOR\s//')
+MINGW_W64_VERSION := $(shell echo "__MINGW64_VERSION_MAJOR" | $(CC) $(CFLAGS) -E -include _mingw.h - | tail -n 1)
 ifneq ($(MINGW_W64_VERSION),)
 HAVE_MINGW_W64 := 1
 mingw_at_least = $(shell [ $(MINGW_W64_VERSION) -gt $(1) ] && echo true)


=====================================
contrib/src/pthreads/rules.mak
=====================================
@@ -58,6 +58,7 @@ pthreads: mingw-w64-$(MINGW64_HASH).tar.xz .sum-pthreads
 .winrt_headers: pthreads
 	mkdir -p -- "$(PREFIX)/include"
 	cd $< && cp mingw-w64-headers/include/windows.storage.h "$(PREFIX)/include"
+	cd $< && cp mingw-w64-headers/include/eventtoken.h "$(PREFIX)/include"
 	touch $@
 
 .sum-dxvahd: .sum-pthreads



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1b7c7b5ab1806ea2a4b5abb25088ba2d15c3a73c...b68cc9074c5f16c2f8d7b64ce82a381d2decad9b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1b7c7b5ab1806ea2a4b5abb25088ba2d15c3a73c...b68cc9074c5f16c2f8d7b64ce82a381d2decad9b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance