diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-11-15 11:05:41 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-11-15 11:25:48 +0200 |
| commit | af6c43c023e9401fd2df9c637bf76096a3e05b9d (patch) | |
| tree | d4402230e1ceefa82a8f6242395d89fee939be43 /solenv/gbuild/extensions | |
| parent | 91fd405c4dee468e4e00a6bd87eb76dd8f57aff3 (diff) | |
No fpicker lib any more, no mork lib on Windows
Change-Id: I07cdd13eef09a84abca0d5204c6f55ca25b9d9c0
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 15d9cfc6d6ad..4ff78bb547bf 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -39,7 +39,6 @@ gb_EXTRAMERGEDLIBS := \ flash \ for \ forui \ - fpicker \ fps_office \ $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ fwl \ @@ -67,7 +66,7 @@ gb_EXTRAMERGEDLIBS := \ $(if $(ENABLE_LWP),lwpft) \ $(call gb_Helper_optional,DESKTOP,migrationoo2) \ $(call gb_Helper_optional,DESKTOP,migrationoo3) \ - $(call gb_Helper_optional,DBCONNECTIVITY,mork) \ + $(if $(filter-out WNT,$(OS)),$(call gb_Helper_optional,DBCONNECTIVITY,mork)) \ $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ |