diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-03 13:56:23 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-03 13:58:11 +0200 |
| commit | 7931b6d3985a1846bf9db4f51d8af9c54538038b (patch) | |
| tree | 9e8e0f1bb619f608dabf63a8b21b941fbef0e084 /solenv | |
| parent | f4e35c5c5e7888574f0074dae0523114dc78e5e1 (diff) | |
Fix dependencies for libmerged wrt. libsofficeapp
Change-Id: If1575e0bcacbc5c3c40d485063b1025017eef73a
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index b85d36fffb41..99f93021b546 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -108,6 +108,7 @@ gb_EXTRAMERGEDLIBS := \ # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ avmedia \ + $(if $(filter $(OS),ANDROID),,basebmp) \ basegfx \ canvastools \ configmgr \ @@ -152,6 +153,9 @@ gb_MERGEDLIBS := \ uui \ vcl \ vclopengl \ + $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ + $(if $(ENABLE_HEADLESS),,vclplug_svp) \ + ) \ xmlscript \ xo \ xstor \ |