[Libreoffice-commits] .: bean/Library_officebean.mk RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk      |   15 +++++++++++++++
 bean/Library_officebean.mk |    4 ++++
 2 files changed, 19 insertions(+)

New commits:
commit e5ccda4bb32eef8cab99c4d43c1571ec4bad3980
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Dec 25 11:23:58 2012 -0500

    fix officebean on mingw
    
    Change-Id: I18994c4c825748344f8d203e1a6be6b242249409

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a982882..015eb88 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -507,6 +507,21 @@ endef
 
 endif # SYSTEM_LIBCMIS
 
+ifeq ($(OS)$(COM),WNTGCC)
+
+define gb_LinkTarget__use_jawt
+$(call gb_LinkTarget_use_packages,$(1),\
+	jawt \
+)
+
+endef
+
+else # $(OS)$(COM) != WNTGCC
+
+gb_LinkTarget__use_jawt :=
+
+endif # $(OS)$(COM) = WNTGCC
+
 
 ifeq ($(SYSTEM_LIBEXTTEXTCAT),YES)
 
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 1c3fb1f..2229e62 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -36,6 +36,10 @@ $(eval $(call gb_Library_use_packages,officebean,\
 	sal_inc \
 ))
 
+$(eval $(call gb_Library_use_externals,officebean,\
+	jawt \
+))
+
 $(eval $(call gb_Library_add_cobjects,officebean,\
 	bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow \
 	bean/native/unix/com_sun_star_beans_LocalOfficeWindow \