From e63ecfa697697fd3010ac6f9fceafc70b234bd39 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 5 Mar 2022 21:18:57 +0200 Subject: [PATCH 20/20] Update to crosser-2.3 See osdn #43921 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 3 ++- windows/installer_cross/winbuild.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 49bb8fe218..c4b7e90f33 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -58,7 +58,7 @@ add_sdl2_env() { } add_qt_env() { - cp -R $1/plugins $2/ && + cp -R $1/qt5/plugins $2/ && cp $1/bin/Qt5Core.dll $2/ && cp $1/bin/Qt5Gui.dll $2/ && cp $1/bin/Qt5Widgets.dll $2/ && @@ -70,6 +70,7 @@ add_qt_env() { add_common_env() { cp $1/bin/libcurl-4.dll $2/ && cp $1/bin/liblzma-5.dll $2/ && + cp $1/bin/libzstd-1.dll $2/ && cp $1/bin/libintl-8.dll $2/ && cp $1/bin/libsqlite3-0.dll $2/ && cp $1/bin/libiconv-2.dll $2/ && diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index c8f1c0e7b2..725fd196f4 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -11,7 +11,7 @@ WINBUILD_VERSION="2.3.4" MIN_WINVER=0x0601 # Windows 7 -CROSSER_FEATURE_LEVEL=2.2 +CROSSER_FEATURE_LEVEL=2.3 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then echo "Usage: $0 [gui]" @@ -154,7 +154,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 ${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}/qt5/include --with-qt5-libs=${DLLSPATH}/lib --with-tinycthread --enable-server=$SERVER --enable-ruledit=$RULEDIT $EXTRA_CONFIG then echo "Configure failed" >&2 exit 1 -- 2.34.1