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/29 08:56:11 UTC
svn commit: r1776388 - in /openoffice/trunk/main/xml2cmp:
Executable_srvdepy.mk Executable_xml2cmp.mk
Author: damjan
Date: Thu Dec 29 08:56:11 2016
New Revision: 1776388
URL: http://svn.apache.org/viewvc?rev=1776388&view=rev
Log:
Don't link to uwinapi as that causes a build error
in xml2cmp on Windows. Also link to stl as not having
it causes another build error.
Patch by: me
Modified:
openoffice/trunk/main/xml2cmp/Executable_srvdepy.mk
openoffice/trunk/main/xml2cmp/Executable_xml2cmp.mk
Modified: openoffice/trunk/main/xml2cmp/Executable_srvdepy.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xml2cmp/Executable_srvdepy.mk?rev=1776388&r1=1776387&r2=1776388&view=diff
==============================================================================
--- openoffice/trunk/main/xml2cmp/Executable_srvdepy.mk (original)
+++ openoffice/trunk/main/xml2cmp/Executable_srvdepy.mk Thu Dec 29 08:56:11 2016
@@ -36,9 +36,11 @@ $(eval $(call gb_Executable_set_include,
))
$(eval $(call gb_Executable_add_linked_libs,srvdepy,\
- $(gb_STDLIBS) \
+ stl \
+ $(filter-out uwinapi,$(gb_STDLIBS)) \
))
+
$(eval $(call gb_Executable_add_exception_objects,srvdepy,\
xml2cmp/source/finder/dependy \
xml2cmp/source/finder/dep_main \
Modified: openoffice/trunk/main/xml2cmp/Executable_xml2cmp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xml2cmp/Executable_xml2cmp.mk?rev=1776388&r1=1776387&r2=1776388&view=diff
==============================================================================
--- openoffice/trunk/main/xml2cmp/Executable_xml2cmp.mk (original)
+++ openoffice/trunk/main/xml2cmp/Executable_xml2cmp.mk Thu Dec 29 08:56:11 2016
@@ -36,7 +36,8 @@ $(eval $(call gb_Executable_set_include,
))
$(eval $(call gb_Executable_add_linked_libs,xml2cmp,\
- $(gb_STDLIBS) \
+ stl \
+ $(filter-out uwinapi,$(gb_STDLIBS)) \
))
$(eval $(call gb_Executable_add_exception_objects,xml2cmp,\