From 295866bfb7e1f18bc4c8214f48e2810860add4cb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 10 Feb 2021 16:37:28 +0200 Subject: [PATCH 13/13] installer_cross: Enable nls when possible Qt-client still does not build with nls enabled in crosser environment, so leave it disabled when ever Qt-client is being built. See osdn #41546 Signed-off-by: Marko Lindqvist --- windows/installer_cross/winbuild.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index e8ed853d02..2ff5de4c04 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -81,7 +81,8 @@ elif test "x$2" != "x" ; then sdl2) FCMP="gtk3" ;; gtk3.22) FCMP="gtk3" ;; gtk3x) FCMP="gtk3" ;; - qt) FCMP="qt" ;; + qt) FCMP="qt" + NLS="--disable-nls" ;; *) echo "Unknown gui \"$2\"!" >&2 exit 1 ;; esac @@ -125,6 +126,7 @@ if test "x$SINGLE_GUI" != "xtrue" ; then then CLIENTS="$CLIENTS,qt" FCMP="$FCMP,qt" + NLS="--disable-nls" fi fi @@ -153,7 +155,7 @@ else GITREVP="" fi -if ! ../../../configure MOCCMD=${DLLSPATH}/bin/moc 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 --disable-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 --with-qt5-includes=${DLLSPATH}/include --with-qt5-libs=${DLLSPATH}/lib --with-tinycthread --enable-server=$SERVER --enable-ruledit=$RULEDIT $EXTRA_CONFIG +if ! ../../../configure MOCCMD=${DLLSPATH}/bin/moc 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 --with-qt5-includes=${DLLSPATH}/include --with-qt5-libs=${DLLSPATH}/lib --with-tinycthread --enable-server=$SERVER --enable-ruledit=$RULEDIT $EXTRA_CONFIG then echo "Configure failed" >&2 exit 1 -- 2.30.0