From f691348039e8b5da15ea4c7602604614748dba60 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 29 Jul 2022 03:07:08 +0300 Subject: [PATCH 29/29] winbuild.sh: Set ac_cv_working_gettimeofday See osdn #45260 Signed-off-by: Marko Lindqvist --- windows/installer_cross/winbuild.sh | 31 ++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index ccfd0eea12..6d82904b16 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -152,7 +152,36 @@ 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 --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 --without-readline --enable-server=$SERVER --enable-ruledit=$RULEDIT $EXTRA_CONFIG +if ! ../../../configure \ + ac_cv_working_gettimeofday=yes \ + 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 \ + --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 \ + --without-readline \ + --enable-server=$SERVER \ + --enable-ruledit=$RULEDIT \ + $EXTRA_CONFIG then echo "Configure failed" >&2 exit 1 -- 2.35.1