Skip to content

C
core
Kaydet (Commit) af6c43c0 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

No fpicker lib any more, no mork lib on Windows 

Change-Id: I07cdd13eef09a84abca0d5204c6f55ca25b9d9c0
üst 91fd405c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @ af6c43c0
...@@ -39,7 +39,6 @@ gb_EXTRAMERGEDLIBS := \ ...@@ -39,7 +39,6 @@ gb_EXTRAMERGEDLIBS := \
flash \ flash \
for \ for \
forui \ forui \
fpicker \
fps_office \ fps_office \
$(call gb_Helper_optional,DBCONNECTIVITY,frm) \ $(call gb_Helper_optional,DBCONNECTIVITY,frm) \
fwl \ fwl \
...@@ -67,7 +66,7 @@ gb_EXTRAMERGEDLIBS := \ ...@@ -67,7 +66,7 @@ gb_EXTRAMERGEDLIBS := \
$(if $(ENABLE_LWP),lwpft) \ $(if $(ENABLE_LWP),lwpft) \
$(call gb_Helper_optional,DESKTOP,migrationoo2) \ $(call gb_Helper_optional,DESKTOP,migrationoo2) \
$(call gb_Helper_optional,DESKTOP,migrationoo3) \ $(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) \ $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
$(if $(filter-out ANDROID IOS,$(OS)),odbc) \ $(if $(filter-out ANDROID IOS,$(OS)),odbc) \
$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment