diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-20 17:38:47 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-21 17:27:00 -0400 |
| commit | 03b5374447f1ff3a5cd881d22110284749c2c286 (patch) | |
| tree | bb62e1f879daa065aa6cbf261e69269781292679 | |
| parent | ba22038b8481c9ea403ceae51d40e11cc80bc122 (diff) | |
add wpftwriter to Library_merged
Change-Id: Id748b3bb2347bf8e8d63a47ff8471e3185cbedcb
| -rw-r--r-- | Library_merged.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 58e219cbf92f..e6243086dbb9 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -43,6 +43,12 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) +ifneq ($(OS),IOS) +$(eval $(call gb_Library_use_static_libraries,merged,\ + writerperfect \ +)) +endif + $(eval $(call gb_Library_use_externals,merged,\ cups \ icui18n \ @@ -52,6 +58,12 @@ $(eval $(call gb_Library_use_externals,merged,\ lcms2 \ libxml2 \ nss3 \ + $(if $(filter-out IOS,$(OS)),\ + wpd \ + wpg \ + wps \ + mwaw \ + ) \ zlib \ )) diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index e776708f859a..9b92c11fc0ee 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -71,6 +71,7 @@ gb_MERGEDLIBS := \ uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ + $(if $(filter-out IOS,$(OS)),wpftwriter) \ xmlscript \ xo \ |