diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-21 16:47:25 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-21 17:27:03 -0400 |
| commit | 26d08e753927b37f51cbcd46f72877e59b8ee7c0 (patch) | |
| tree | 3cc8171f547f748dfb7815a988577d7faa6354d8 | |
| parent | 36e3331ba1eae892b350a16a4036644d7d217ddf (diff) | |
add wpftdraw to Library_merged
Change-Id: I40471e76a338430e010ad53f64aa6328f3c81b44
| -rw-r--r-- | Library_merged.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 4c632bc3a6cf..3684bd8d6d14 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -60,11 +60,13 @@ $(eval $(call gb_Library_use_externals,merged,\ nss3 \ openssl \ $(if $(filter-out IOS,$(OS)),\ + cdr \ wpd \ wpg \ wps \ mwaw \ - ) \ + mspub \ + visio) \ zlib \ )) diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 6597c4dce9d9..6af96e0a5e95 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -73,7 +73,9 @@ gb_MERGEDLIBS := \ uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ - $(if $(filter-out IOS,$(OS)),wpftwriter) \ + $(if $(filter-out IOS,$(OS)), \ + wpftdraw \ + wpftwriter) \ xmlscript \ xmlsecurity \ xo \ |