openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject [openoffice] branch trunk updated: Patch for Win64 shell extension, provided by: Don Lewis
Date Sat, 05 Oct 2019 09:37:46 GMT
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f65b8bf  Patch for Win64 shell extension, provided by: Don Lewis
f65b8bf is described below

commit f65b8bff325add857d0f70d81aeb09a90aa05edf
Author: mseidel <mseidel@apache.org>
AuthorDate: Sat Oct 5 11:37:13 2019 +0200

    Patch for Win64 shell extension, provided by: Don Lewis
---
 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))


Mime
View raw message