[vlc-commits] contrib: disable Rust on Winstore builds

Steve Lhomme git at videolan.org
Tue Oct 13 13:15:33 CEST 2020


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Oct 13 13:15:22 2020 +0200| [4e2e0ba1934ab900cbb0784271a42a1476e0275e] | committer: Steve Lhomme

contrib: disable Rust on Winstore builds

It's using some forbidden API's in UWP:
https://code.videolan.org/videolan/vlc/-/jobs/462281

- https://docs.microsoft.com/en-us/windows/win32/api/tlhelp32/nf-tlhelp32-createtoolhelp32snapshot
- https://docs.microsoft.com/en-us/windows/win32/api/tlhelp32/nf-tlhelp32-module32firstw
- https://docs.microsoft.com/en-us/windows/win32/api/tlhelp32/nf-tlhelp32-module32nextw

We were using a wrong target for winstore: x86_64-pc-windows-gnu instead of
x86_64-uwp-windows-gnu, hence the usage of forbidden APIs.

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

 contrib/src/main-rust.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main-rust.mak b/contrib/src/main-rust.mak
index 36ca76d8ef..1edd8f3c89 100644
--- a/contrib/src/main-rust.mak
+++ b/contrib/src/main-rust.mak
@@ -4,6 +4,7 @@
 # This file is under the same license as the vlc package.
 
 ifdef HAVE_WIN32
+ifdef HAVE_WINSTORE
 ifeq ($(HOST),i686-w64-mingw32)
 RUST_TARGET = i686-pc-windows-gnu # ARCH is i386
 else ifeq ($(HOST),x86_64-w64-mingw32)
@@ -11,6 +12,7 @@ RUST_TARGET = $(ARCH)-pc-windows-gnu
 else
 # Not supported on armv7/aarch64 yet
 endif
+endif
 else ifdef HAVE_ANDROID
 RUST_TARGET = $(HOST)
 else ifdef HAVE_IOS



More information about the vlc-commits mailing list