[vlc-devel] [PATCH] contrib: detect the winstore target from the prefix triplet

Steve Lhomme robux4 at ycbcr.xyz
Tue Mar 5 13:23:40 CET 2019


The MSVC toolchain already uses custom triplets depending on the Winstore flavor:
- mingw32uwp (win10)
- mingw32winrt (win8.1)

We are considering doing the same with the LLVM toolchain
---
 contrib/bootstrap | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 96c59f71fa..266817bfcc 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -49,6 +49,7 @@ GPL="1"
 GNUV3="1"
 AD_CLAUSES=
 WITH_OPTIMIZATION="1"
+HAVE_WINSTORE=
 
 if test ! -f "../../contrib/src/main.mak"
 then
@@ -71,6 +72,11 @@ do
 			;;
 		--prefix=*)
 			PREFIX="${1#--prefix=}"
+			case "${PREFIX}" in
+				*winphone*|*windowsphone*|*winrt*|*uwp*)
+				HAVE_WINSTORE="1"
+				;;
+			esac
 			;;
 		--disable-disc)
 			BUILD_DISCS=
@@ -355,7 +361,7 @@ case "${OS}" in
 		esac
 		case "${HOST}" in
 			*winphone*|*windowsphone*|*winrt*|*uwp*)
-			add_make_enabled "HAVE_WINSTORE"
+			HAVE_WINSTORE="1"
 			;;
 		esac
 		case "${HOST}" in
@@ -377,6 +383,8 @@ case "${OS}" in
 		;;
 esac
 
+test -z "$HAVE_WINSTORE" || add_make_enabled "HAVE_WINSTORE"
+
 #
 # Results output
 #
-- 
2.17.1



More information about the vlc-devel mailing list