diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 21:58:39 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:11 -0400 |
| commit | 470c5fefa5ea60183f3c8056da27dbde1e2c0078 (patch) | |
| tree | 434aa3bd56d7c70ec20bc0bacc91d3bc4e1b503d /solenv | |
| parent | 1081150d3575b2da393862214b71dbf30cc489a3 (diff) | |
add basebmp and unotest to Library_merged
Change-Id: I13dadec895bc67a903956c6a4e6bdbfa9a1b8d84
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 344655b31183..b419e1320abf 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -30,6 +30,7 @@ ifeq ($(MERGELIBS),TRUE) # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ avmedia \ + $(if $(filter unx,$(GUIBASE)),basebmp) \ $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ canvastools \ chartcore \ @@ -96,6 +97,7 @@ gb_MERGEDLIBS := \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ ucpfile1 \ + unotest \ utl \ uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ |