From cf5f26ed66bed361eb800496a6f20b3a4967d365 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 16 Apr 2022 06:14:12 +0300 Subject: [PATCH 55/55] installer_cross: Enable nls on Qt-client build See osdn #44292 Signed-off-by: Marko Lindqvist --- windows/installer_cross/winbuild.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index 605ad992cb..c331c575b3 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -82,10 +82,8 @@ elif test "x$2" != "x" ; then gtk3.22) FCMP="gtk3" ;; gtk4) FCMP="gtk4" ;; qt5) FCMP="qt" - NLS="--disable-nls" QTVER="Qt5" ;; qt6) FCMP="qt" - NLS="--disable-nls" QTVER="Qt6" ;; *) echo "Unknown gui \"$2\"!" >&2 exit 1 ;; @@ -142,7 +140,6 @@ if test "$SINGLE_GUI" != "true" ; then then CLIENTS="$CLIENTS,qt" FCMP="$FCMP,qt" - NLS="--disable-nls" fi fi @@ -183,7 +180,7 @@ if test "x$MOCCMD" = "x" && test "x$MOC_CROSSER" != "x" ; then MOCPARAM="MOCCMD=${MOC_CROSSER}" fi -if ! ../../../configure $MOCPARAM FREECIV_LABEL_FORCE="-crs" CPPFLAGS="-I${DLLSPATH}/include -D_WIN32_WINNT=${MIN_WINVER}" CFLAGS="-Wno-error" PKG_CONFIG_LIBDIR="${DLLSPATH}/lib/pkgconfig" --enable-sys-tolua-cmd --with-magickwand="${DLLSPATH}/bin" --prefix="/" $GITREVP --enable-client=$CLIENTS --enable-fcmp=$FCMP --enable-debug ${NLS} --host=$TARGET --build=$(../../../bootstrap/config.guess) --with-libiconv-prefix=${DLLSPATH} --with-sqlite3-prefix=${DLLSPATH} --with-followtag="crosser" --enable-crosser ${AIS} --disable-freeciv-manual --enable-sdl-mixer=sdl2 ${QTPARAMS} --with-tinycthread --enable-server=$SERVER --enable-ruledit=$RULEDIT $EXTRA_CONFIG +if ! ../../../configure $MOCPARAM FREECIV_LABEL_FORCE="-crs" CPPFLAGS="-I${DLLSPATH}/include -D_WIN32_WINNT=${MIN_WINVER}" CFLAGS="-Wno-error" PKG_CONFIG_LIBDIR="${DLLSPATH}/lib/pkgconfig" --enable-sys-tolua-cmd --with-magickwand="${DLLSPATH}/bin" --prefix="/" $GITREVP --enable-client=$CLIENTS --enable-fcmp=$FCMP --enable-debug --host=$TARGET --build=$(../../../bootstrap/config.guess) --with-libiconv-prefix=${DLLSPATH} --with-sqlite3-prefix=${DLLSPATH} --with-followtag="crosser" --enable-crosser ${AIS} --disable-freeciv-manual --enable-sdl-mixer=sdl2 ${QTPARAMS} --with-tinycthread --enable-server=$SERVER --enable-ruledit=$RULEDIT $EXTRA_CONFIG then echo "Configure failed" >&2 exit 1 -- 2.35.1