diff --git a/ChangeLog.txt b/ChangeLog.txt index 50e6a9cc7a..247667f10f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,13 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ + +2025-11-16 22:10 UTC+0200 Aleksander Czajczynski (hb fki.pl) + * config/win/zig.mk + ! in some Zig tests, building for Windows from UNIX shell (MSYS2 + or cross compiling) resource compiler "zig rc" preferred options + passed with "-" instead of "/" + 2025-11-16 22:00 UTC+0200 Aleksander Czajczynski (hb fki.pl) ; import hbcrypto.h header that allows reusing core sha functions by contribs, coming from Viktor's fork: diff --git a/config/win/zig.mk b/config/win/zig.mk index 53a806ad69..04669dd3f5 100644 --- a/config/win/zig.mk +++ b/config/win/zig.mk @@ -1,6 +1,11 @@ RC := zig rc -RCFLAGS := /I. /I$(HB_HOST_INC) /C 1252 -RC_OUT := /FO$(subst x,x, ) +ifeq ($(HB_SHELL),sh) + RCFLAGS := -I. -I$(HB_HOST_INC) -C 1252 + RC_OUT := -FO$(subst x,x, ) +else + RCFLAGS := /I. /I$(HB_HOST_INC) /C 1252 + RC_OUT := /FO$(subst x,x, ) +endif RES_EXT := .res IMPLIBFLAGS = -Wl,--out-implib,$(IMP_FILE)