From b75373cebf8aae1ae04eb65f63d20db209442013 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 23 Oct 2022 21:48:08 +0300 Subject: [PATCH 39/39] Msys2: Stop using snapshot.project As S3_1 has the datafile formats frozen already, any files it writes are of the stable format. It's better to have them under stable's "~/.freeciv/" than in more testing oriented location. See osdn #45934 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index a3b233f902..65b58c2999 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -98,11 +98,11 @@ ruledit-installer-qt6: snapshot: cd ../.. ; ./autogen.sh --no-configure-run - make VERSION_REVTYPE="git" EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" all + make VERSION_REVTYPE="git" EXTRA_CONFIG="--enable-gitrev CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" all ci: cd ../.. ; ./autogen.sh --no-configure-run - make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" gtk3.22-installer sdl2-installer ruledit-installer-qt6 qt6-installer + make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" gtk3.22-installer sdl2-installer ruledit-installer-qt6 qt6-installer # configure Freeciv -- 2.35.1