Feature #720 ยป 0027-installer_cross-Build-qt6x-client-installer.patch
| platforms/windows/installer_cross/meson-build_all_installers.sh | ||
|---|---|---|
|
QT6="Success"
|
||
|
fi
|
||
|
if test "${CROSSER_QT6}" != "yes" ; then
|
||
|
QT7="N/A"
|
||
|
elif ! ./meson-installer_build.sh "${DLLSPATH}" qt6x ; then
|
||
|
RET=1
|
||
|
QT7="Fail"
|
||
|
else
|
||
|
QT7="Success"
|
||
|
fi
|
||
|
# sdl2-client comes with gtk4 modpack installer
|
||
|
if test "${CROSSER_GTK4}" != "yes" ; then
|
||
|
SDL2="N/A"
|
||
| ... | ... | |
|
echo "Gtk4: ${GTK4}"
|
||
|
echo "Gtk4x: ${GTK4x}"
|
||
|
echo "Qt6: ${QT6}"
|
||
|
echo "Qt6x: ${QT7}"
|
||
|
echo "Sdl2: ${SDL2}"
|
||
|
echo "Ruledit: ${RULEDIT}"
|
||
| platforms/windows/installer_cross/meson-installer_build.sh | ||
|---|---|---|
|
DLLSPATH="$1"
|
||
|
GUI="$2"
|
||
|
case $GUI in
|
||
|
case "$GUI" in
|
||
|
gtk3.22)
|
||
|
GUINAME="GTK3.22"
|
||
|
MPGUI="gtk3"
|
||
| ... | ... | |
|
CLIENT="qt"
|
||
|
MPGUI="qt"
|
||
|
FCMP="qt" ;;
|
||
|
qt6x)
|
||
|
GUINAME="Qt6x"
|
||
|
CLIENT="qt"
|
||
|
MPGUI="qt"
|
||
|
FCMP="qt" ;;
|
||
|
ruledit)
|
||
|
;;
|
||
|
*)
|
||
| ... | ... | |
|
exit 1
|
||
|
fi
|
||
|
;;
|
||
|
qt6)
|
||
|
qt6|qt6x)
|
||
|
if ! cp freeciv-ruledit.cmd "${INSTDIR}"
|
||
|
then
|
||
|
echo "Adding cmd-file failed!" >&2
|
||
| ... | ... | |
|
;;
|
||
|
esac
|
||
|
if test "${GUI}" = "qt6" ; then
|
||
|
if test "${GUI}" = "qt6" || test "${GUI}" = "qt6x" ; then
|
||
|
EXE_ID="qt"
|
||
|
else
|
||
|
EXE_ID="${GUI}"
|
||