This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4780e0d4379161fd1903f2912c7cde06b7d71097 Author: Peter Kovacs <[email protected]> AuthorDate: Sat Jul 25 19:32:05 2026 +0200 vcl/win64: link version.lib + set the x64 DLL entry point (dmake) Port of the Win64 gbuild changes from origin/windows-amd64 to the dmake vcl makefile, since trunk builds vcl via dmake, not gbuild: - b4ae19cf68: link "version" (VerQueryValueW &c.) -> add $(VERSIONLIB) to SHL1STDLIBS (defined as version.lib on both wntmsci11 and wntmscx). - f3e0634fae: give the x64 build a DLL entry point. windows-amd64 used /ENTRY:LibMain@16, but LibMain is WINAPI (__stdcall): x86 decorates it LibMain@12 while x64 has NO stdcall @N decoration, so the entry symbol is the undecorated LibMain. Corrected here to /ENTRY:LibMain for WNTMSCX, matching the proven bazel-migration build that boots on x64. Co-Authored-By: Claude Opus 4.8 <[email protected]> --- main/vcl/util/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main/vcl/util/makefile.mk b/main/vcl/util/makefile.mk index d6294bd791..a4051d1a34 100644 --- a/main/vcl/util/makefile.mk +++ b/main/vcl/util/makefile.mk @@ -246,12 +246,17 @@ SHL1STDLIBS += $(UWINAPILIB) \ $(WINSPOOLLIB) \ $(OLE32LIB) \ $(SHELL32LIB) \ - $(ADVAPI32LIB) + $(ADVAPI32LIB) \ + $(VERSIONLIB) SHL1STDLIBS += $(IMM32LIB) .IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI" LINKFLAGSSHL += /ENTRY:LibMain@12 +.ELIF "$(GUI)$(COM)$(CPU)" == "WNTMSCX" +# LibMain is WINAPI (__stdcall): x86 decorates it LibMain@12; x64 has no +# stdcall @N decoration, so the entry symbol is the undecorated LibMain. +LINKFLAGSSHL += /ENTRY:LibMain .ENDIF .ENDIF
