From 574d01d452317acca4197144c2bbedb8a04ceb06 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 24 Mar 2021 07:20:05 +0200 Subject: [PATCH 34/35] meson-winbuild.sh: Fix to work with crosser-2.0 See osdn #41848 Signed-off-by: Marko Lindqvist --- windows/installer_cross/meson-winbuild.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index 1af68daace..53574d8ae3 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -39,21 +39,21 @@ if test "x$INST_CROSS_MODE" != "xrelease" ; then fi fi -FLVL=$(grep "FeatureLevel=" $DLLSPATH/crosser.txt | sed -e 's/FeatureLevel="//' -e 's/"//') +FLVL=$(grep "CrosserFeatureLevel=" $DLLSPATH/crosser.txt | sed -e 's/CrosserFeatureLevel="//' -e 's/"//') if test "x$FLVL" != "x$CROSSER_FEATURE_LEVEL" ; then echo "Crosser feature level \"$FLVL\", required \"$CROSSER_FEATURE_LEVEL\"!" exit 1 fi -CSET=$(grep "Set=" $DLLSPATH/crosser.txt | sed -e 's/Set="//' -e 's/"//') +CSET=$(grep "CrosserSet=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSet="//' -e 's/"//') if test "x$CSET" != "xcurrent" ; then echo "Crosser set is \"$CSET\", only \"current\" is supported!" exit 1 fi -SETUP=$(grep "Setup=" $DLLSPATH/crosser.txt | sed -e 's/Setup="//' -e 's/"//') +SETUP=$(grep "CrosserSetup=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSetup="//' -e 's/"//') if ! rm -Rf meson-build-${SETUP} ; then echo "Failed to clear out old build directory!" >&2 -- 2.30.2