diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-12-25 11:23:58 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-25 11:23:58 -0500 |
| commit | e5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (patch) | |
| tree | 3ed60022faff3db502c5abed45c2a98cf6423a94 | |
| parent | 43a9cd8a9c6fe9db2f899cf35095baf6f559c6b2 (diff) | |
fix officebean on mingw
Change-Id: I18994c4c825748344f8d203e1a6be6b242249409
| -rw-r--r-- | RepositoryExternal.mk | 15 | ||||
| -rw-r--r-- | bean/Library_officebean.mk | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a982882844a2..015eb882adc8 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 1c3fb1fb4453..2229e625157c 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 \ |