[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sal/Library_uwinapi.mk

Fridrich Strba fridrich at kemper.freedesktop.org
Wed Jun 13 14:45:24 PDT 2012


 sal/Library_uwinapi.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 37780cde7a941cf3b71336f02aea7c05cbaf4129
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jun 13 23:10:25 2012 +0200

    trying to fix mingw build
    
    Change-Id: I86c06fc3f7dcd0a24898a602a60c10abdc588b81
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index 8d7f828..aa06e11 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -47,6 +47,12 @@ $(eval $(call gb_Library_add_defs,uwinapi,\
 $(eval $(call gb_Library_add_cobjects,uwinapi,\
 	sal/systools/win32/uwinapi/snprintf \
 	sal/systools/win32/uwinapi/snwprintf \
+))
+
+ifeq ($(COM),MSC)
+
+
+$(eval $(call gb_Library_add_cobjects,uwinapi,\
 	sal/systools/win32/uwinapi/legacy \
 ))
 
@@ -54,6 +60,7 @@ $(eval $(call gb_Library_add_ldflags,uwinapi,\
 	/DEF:$(SRCDIR)/sal/systools/win32/uwinapi/uwinapi.def \
 ))
 
+endif
 
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list