[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit af6c43c023e9401fd2df9c637bf76096a3e05b9d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 15 11:05:41 2013 +0200

    No fpicker lib any more, no mork lib on Windows
    
    Change-Id: I07cdd13eef09a84abca0d5204c6f55ca25b9d9c0

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 15d9cfc..4ff78bb 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) \