Author: cazfi
Date: Sat May 20 10:34:11 2017
New Revision: 35673
URL: http://svn.gna.org/viewcvs/freeciv?rev=35673&view=rev
Log:
Add "-crs" to version number of installer_cross builds
Distinguish installer_cross builds from other build types
See hrm Feature #661802
Modified:
branches/S3_0/windows/installer_cross/winbuild.sh
Modified: branches/S3_0/windows/installer_cross/winbuild.sh
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/winbuild.sh?rev=35673&r1=35672&r2=35673&view=diff
==============================================================================
--- branches/S3_0/windows/installer_cross/winbuild.sh (original)
+++ branches/S3_0/windows/installer_cross/winbuild.sh Sat May 20 10:34:11 2017
@@ -134,7 +134,7 @@
if ! (
cd build-$SETUP$GUIP
-if ! ../../../configure 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="/" --enable-client=$CLIENTS
--enable-fcmp=$FCMP --enable-svnrev --enable-debug --host=$TARGET
--build=$(../../../bootstrap/config.guess) --with-libiconv-prefix=${DLLSPATH}
--with-sqlite3-prefix=${DLLSPATH} --with-followtag="crosser" --enable-crosser
--enable-ai-static=${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
+if ! ../../../configure FREECIV_LABEL_FORCE="<base>-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="/"
--enable-client=$CLIENTS --enable-fcmp=$FCMP --enable-svnrev --enable-debug
--host=$TARGET --build=$(../../../bootstrap/config.guess)
--with-libiconv-prefix=${DLLSPATH} --with-sqlite3-prefix=${DLLSPATH}
--with-followtag="crosser" --enable-crosser --enable-ai-static=${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
then
echo "Configure failed" >&2
exit 1
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
