Project

General

Profile

Feature #1372 ยป 0095-Msys2-Makefile.meson-Use-syntax.patch

Marko Lindqvist, 06/05/2025 03:38 AM

View differences:

platforms/windows/installer_msys2/Makefile.meson
error "Unsupported MSYSTEM environment"
endif
IMSYS2_DIR = $(shell pwd)
IMSYS2_DIR != pwd
FREECIV_VERSION != $(SRC_ROOT)/fc_version
ifeq ($(MIN_WIN_VER),)
MIN_WIN_VER=$(PREF_WIN_VER)
......
make -f $(MAKEFILE_NAME) GUI=qt6x EXTRA_CONFIG="-Dqtver=qt6x $(EXTRA_CONFIG)" install-ruledit-qt6x
installer-common: install-freeciv-$(GUI) install-env-$(GUI)
# Extract Freeciv version
$(eval FREECIV_VERSION := $(shell $(SRC_ROOT)/fc_version))
# Create portable .7z
mkdir -p $(7ZDIR)
7z a -r $(7ZDIR)/Freeciv-$(FREECIV_VERSION)-client-$(WINARCH)-$(GUI).7z ./$(INST_DIR)/$(WINARCH)-client-$(GUI)/*
......
installer-ruledit-common: install-ruledit-$(GUI)
# Add DLLs
cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/
# Extract Freeciv version
$(eval FREECIV_VERSION := $(shell $(SRC_ROOT)/fc_version))
# Create portable .7z
mkdir -p $(7ZDIR)
7z a -r $(7ZDIR)/Freeciv-$(FREECIV_VERSION)-ruledit-$(WINARCH)-$(GUI).7z ./$(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/*
    (1-1/1)