You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/17 03:21:04 UTC
svn commit: r1774707 - in /openoffice/trunk/main/dtrans: Library_dnd.mk
Library_sysdtrans_win.mk
Author: damjan
Date: Sat Dec 17 03:21:04 2016
New Revision: 1774707
URL: http://svn.apache.org/viewvc?rev=1774707&view=rev
Log:
Fix further dtrans build issues on Windows.
All of dtrans needs to have exception handling enabled.
XNotifyingDataObject should only be linked to by systrans.dll
Patch by: me
Modified:
openoffice/trunk/main/dtrans/Library_dnd.mk
openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk
Modified: openoffice/trunk/main/dtrans/Library_dnd.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_dnd.mk?rev=1774707&r1=1774706&r2=1774707&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/Library_dnd.mk (original)
+++ openoffice/trunk/main/dtrans/Library_dnd.mk Sat Dec 17 03:21:04 2016
@@ -77,8 +77,7 @@ $(eval $(call gb_Library_add_cxxobjects,
dtrans/source/win32/dtobj/FmtFilter \
dtrans/source/win32/dtobj/FetcList \
dtrans/source/win32/dtobj/Fetc \
- dtrans/source/win32/dtobj/XNotifyingDataObject \
- , -GR -Ob0 \
+ , -GR -Ob0 $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
else
$(eval $(call gb_Library_add_exception_objects,dnd,\
@@ -92,7 +91,6 @@ $(eval $(call gb_Library_add_exception_o
dtrans/source/win32/dtobj/FmtFilter \
dtrans/source/win32/dtobj/FetcList \
dtrans/source/win32/dtobj/Fetc \
- dtrans/source/win32/dtobj/XNotifyingDataObject \
))
endif
Modified: openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk?rev=1774707&r1=1774706&r2=1774707&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk (original)
+++ openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk Sat Dec 17 03:21:04 2016
@@ -77,7 +77,7 @@ $(eval $(call gb_Library_add_cxxobjects,
dtrans/source/win32/dtobj/FetcList \
dtrans/source/win32/dtobj/Fetc \
dtrans/source/win32/dtobj/XNotifyingDataObject \
- , -GR -Ob0 \
+ , -GR -Ob0 $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
else
$(eval $(call gb_Library_add_exception_objects,sysdtrans,\