From 4d4ef74cebdf7b083ea7e0a30120580ae9754286 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 16 Feb 2022 21:33:01 +0200 Subject: [PATCH 38/38] build_all_installers.sh: Add Qt6-client installer support See osdn #43877 Signed-off-by: Marko Lindqvist --- windows/installer_cross/build_all_installers.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/windows/installer_cross/build_all_installers.sh b/windows/installer_cross/build_all_installers.sh index 592ed06b79..6f631a2754 100755 --- a/windows/installer_cross/build_all_installers.sh +++ b/windows/installer_cross/build_all_installers.sh @@ -1,5 +1,5 @@ #!/bin/bash -#/********************************************************************** +#/*********************************************************************** # Freeciv - Copyright (C) 2017 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -46,6 +46,11 @@ then CROSSER_QT5=yes fi +if grep "CROSSER_QT6" $DLLSPATH/crosser.txt | grep yes > /dev/null +then + CROSSER_QT6=yes +fi + if grep "CROSSER_GTK4" $DLLSPATH/crosser.txt | grep yes > /dev/null then CROSSER_GTK4=yes @@ -67,6 +72,15 @@ else QT5="Success" fi +if test "x$CROSSER_QT6" != "xyes" ; then + QT6="N/A" +elif ! ./installer_build.sh $DLLSPATH qt6 ; then + RET=1 + QT6="Fail" +else + QT6="Success" +fi + # sdl2-client comes with gtk4 modpack installer if test "x$CROSSER_GTK4" != "xyes" ; then SDL2="N/A" @@ -88,6 +102,7 @@ fi echo "Gtk3.22: $GTK322" echo "Qt5: $QT5" +echo "Qt6: $QT6" echo "Sdl2: $SDL2" echo "Ruledit: $RULEDIT" -- 2.34.1