[Libreoffice-commits] .: xml2cmp/Executable_xml2cmp.mk

Caolán McNamara caolan at kemper.freedesktop.org
Fri Sep 16 03:49:33 PDT 2011


 xml2cmp/Executable_xml2cmp.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 5c36b903302b2a0ee589f909d6445cd122e657fd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 16 11:49:13 2011 +0100

    avoid linking to uwinapi here (which gb_STDLIBS contains that anyway)

diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk
index 28ed105..5387a8c 100644
--- a/xml2cmp/Executable_xml2cmp.mk
+++ b/xml2cmp/Executable_xml2cmp.mk
@@ -47,6 +47,14 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\
 	xml2cmp/source/xcd/dependy \
 ))
 
+#uwinapi is part of STDLIBS on windows, but is created in sal,
+#which depends on this module.
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,xml2cmp,\
+    advapi32 \
+))
+else
 $(eval $(call gb_Executable_add_linked_libs,xml2cmp,\
     $(gb_STDLIBS) \
 ))
+endif


More information about the Libreoffice-commits mailing list