[Libreoffice-commits] .: 2 commits - forms/Library_frm.mk lotuswordpro/Library_lwpft.mk

[Kohei Yoshida]

 forms/Library_frm.mk          |    9 +++++++++
 lotuswordpro/Library_lwpft.mk |    7 +++++++
 2 files changed, 16 insertions(+)

New commits:
commit e5b88760649f56e3f6e3de55a00be389cb06ed15
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Fri Aug 19 20:57:27 2011 -0400

    get forms buildable on windows.

diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 33b2f8d..91ec3b0 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -63,11 +63,20 @@ $(eval $(call gb_Library_add_linked_libs,frm,\
     vcl \
     $(gb_STDLIBS) \
 ))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_Library_use_externals,frm,\
+    icuin \
+    icuuc \
+    libxml2 \
+))
+else
 $(eval $(call gb_Library_use_externals,frm,\
     icui18n \
     icuuc \
     libxml2 \
 ))
+endif
 
 $(eval $(call gb_Library_set_componentfile,frm,forms/util/frm))
 
commit 5673dc9620c7049764e33a4f68e696ddfb9d7203
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Fri Aug 19 20:18:12 2011 -0400

    icui18n -> icuin on Windows. Now lotuswordpro builds.

diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index ecf13d8..8d2dbb1 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -54,10 +54,17 @@ $(eval $(call gb_Library_add_linked_libs,lwpft,\
     $(gb_STDLIBS) \
 ))
 
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_Library_use_externals,lwpft,\
+    icuin \
+    icuuc \
+))
+else
 $(eval $(call gb_Library_use_externals,lwpft,\
     icui18n \
     icuuc \
 ))
+endif
 
 $(eval $(call gb_Library_set_componentfile,lwpft,lotuswordpro/util/lwpfilter))