From ccfe16475b67c6d3dbb400c087f96cd881992640 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 15 Jan 2022 07:52:59 +0200 Subject: [PATCH 44/44] installer_cross: Cleanup passing parameters to nsi creation scripts See osdn #43597 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index f5df3f41ca..264af084a3 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -111,12 +111,14 @@ case $GUI in FCMP="gtk3" ;; qt) GUINAME="Qt" + MPGUI="qt" FCMP="qt" ;; sdl2) GUINAME="SDL2" FCMP="gtk3" ;; gtk4) GUINAME="GTK4" + MPGUI="gtk4" FCMP="gtk4" ;; ruledit) ;; *) @@ -246,7 +248,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 @@ -256,7 +259,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