From c092aee89b8b70acfed214ba56289511d48db87d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 15 Jan 2022 07:56:40 +0200 Subject: [PATCH 12/12] installer_cross: Cleanup passing parameters to nsi creation scripts See osdn #43597 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index e55099f16c..a9b5ffe2bd 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -97,6 +97,7 @@ case $GUI in FCMP="gtk3" ;; qt) GUINAME="Qt" + MPGUI="qt" FCMP="qt" ;; sdl2) GUINAME="SDL2" @@ -222,7 +223,8 @@ else esac if test "x$GUI" = "xsdl2" ; then - if ! ./create-freeciv-sdl2-nsi.sh $INSTDIR $VERREV $SETUP > Freeciv-$SETUP-$VERREV-$GUI.nsi helpers/uninstaller-helper-gtk3.sh + if ! ./create-freeciv-sdl2-nsi.sh $INSTDIR $VERREV $SETUP helpers/uninstaller-helper-gtk3.sh \ + > Freeciv-$SETUP-$VERREV-$GUI.nsi then exit 1 fi @@ -232,7 +234,8 @@ else else UNINSTALLER="" fi - if ! ./create-freeciv-gtk-qt-nsi.sh $INSTDIR $VERREV $GUI $GUINAME $SETUP $MPGUI > Freeciv-$SETUP-$VERREV-$GUI.nsi $UNINSTALLER + if ! ./create-freeciv-gtk-qt-nsi.sh $INSTDIR $VERREV $GUI $GUINAME \ + $SETUP $MPGUI $UNINSTALLER > Freeciv-$SETUP-$VERREV-$GUI.nsi then exit 1 fi -- 2.34.1