This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 3d054da97496f0fc4f74496ac5cb992a77a3c3d3 Author: mseidel <[email protected]> AuthorDate: Sat Oct 5 11:37:13 2019 +0200 Patch for Win64 shell extension, provided by: Don Lewis (cherry picked from commit f65b8bff325add857d0f70d81aeb09a90aa05edf) --- main/solenv/inc/set_wntx64.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main/solenv/inc/set_wntx64.mk b/main/solenv/inc/set_wntx64.mk index 58a037c..d62b420 100644 --- a/main/solenv/inc/set_wntx64.mk +++ b/main/solenv/inc/set_wntx64.mk @@ -47,6 +47,10 @@ USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb USE_CDEFS_X64+=-DDEBUG .ENDIF # "$(debug)"!="" +# Required for correct Windows function call ABI for expat static library +.IF "$(SYSTEM_EXPAT)"=="NO" +USE_CDEFS_X64+=-DXML_STATIC +.ENDIF USE_CFLAGS_X64+=$(CFLAGS_X64) USE_CDEFS_X64+=$(CDEFS_X64) INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
