diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-19 21:55:36 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-21 17:27:00 -0400 |
| commit | f294ecbe68f6839c19058dc0063942501ebd67da (patch) | |
| tree | b1d12ca3e49d3117185c6a04cabdfa1f98d5203c /solenv | |
| parent | e08159e244916e97b963874944923a79cb9dca2e (diff) | |
add sw swd msfilter vbahelper to Library_merged
Change-Id: If7fc0b480c58599e86bf3b75080b8b18d5d79488
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 87470feb98fb..a95db1998d1a 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -46,6 +46,7 @@ gb_MERGEDLIBS := \ i18nutil \ lng \ localebe1 \ + msfilter \ package2 \ sax \ sb \ @@ -57,16 +58,19 @@ gb_MERGEDLIBS := \ svt \ svx \ svxcore \ + sw \ + swd \ tk \ + $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ ucpfile1 \ utl \ uui \ + $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ xmlscript \ xo \ -gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) ifeq ($(OS),ANDROID) gb_MERGEDLIBS += \ |