From 5c2931a3867a5c34a1c1c0f5469568ed518a57bb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 13 May 2022 17:51:24 +0300 Subject: [PATCH 41/41] meson-winbuild.sh: Build ruledit only with qt-client See osdn #44579 Signed-off-by: Marko Lindqvist --- windows/installer_cross/meson-winbuild.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index 8e1236dca1..b8285fa8a6 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -64,11 +64,14 @@ fi SETUP=$(grep "CrosserSetup=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSetup="//' -e 's/"//') case $GUI in - gtk3.22) FCMP="gtk3" ;; - sdl2) FCMP="gtk4" ;; + gtk3.22) FCMP="gtk3" + RULEDIT=false ;; + sdl2) FCMP="gtk4" + RULEDIT=false ;; qt5) CLIENT="qt" FCMP="qt" - NLS="-Dnls=false" ;; + NLS="-Dnls=false" + RULEDIT=true ;; esac if test "x$CLIENT" = "x" ; then @@ -110,7 +113,7 @@ cd meson-build-${SETUP}-${GUI} export PKG_CONFIG_PATH=${DLLSPATH}/lib/pkgconfig if ! meson --cross-file=cross.txt -Dprefix=$MESON_INSTALL_DIR -Dclients=$CLIENT -Dfcmp=$FCMP \ - ${NLS} -Dsyslua=false \ + ${NLS} -Dsyslua=false -Druledit=$RULEDIT \ ../../.. $EXTRA_CONFIG ; then echo "Meson run failed!" >&2 exit 1 -- 2.35.1