From 1cc4869cb566174d06e5c1d0a0461180779ce1c2 Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Wed, 5 Aug 2026 23:26:25 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BF=AE=E5=A4=8DGitHub=20Actions?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E7=BC=96=E8=AF=91win?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6943fbea3..cf26f2761 100755 --- a/Makefile +++ b/Makefile @@ -103,6 +103,14 @@ ifeq ($(MAKECMDGOALS), build-in-ci-release-mode) CFLAGS += $(CFLAGS_optimization) + # Windows 上嵌入图标与版本信息资源 (与 justfile 中 build-in-release-mode 一致) + # 注意: Android 交叉编译同样在 Windows/MSYS2 下进行, 必须排除, 不能链入 Windows 资源 + ifeq ($(On-Windows), 1) + ifneq ($(CROSS_BUILD_WINDOWS_FOR_ANDROID), 1) + Windows-CI-Resource = chsrc.res + endif + endif + # 仅在 Linux 上使用静态链接 ifeq ($(On-Linux), 1) CFLAGS += $(CFLAGS_static) @@ -156,7 +164,10 @@ build-in-release-mode: # CI release mode 的配置在该文件上方 build-in-ci-release-mode: @echo Starting: Build in CI-RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(CIReleaseMode-Target-Name) - @$(CC) src/chsrc-main.c $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) +ifeq ($(Windows-CI-Resource), chsrc.res) + @windres src/resource/chsrc.rc -O coff -o chsrc.res +endif + @$(CC) src/chsrc-main.c $(Windows-CI-Resource) $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) @echo Finished: Build in CI-RELEASE mode # 永远重新编译