diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-27 14:24:21 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:15 -0400 |
| commit | c74f2edfce221960fe546e88f2b3222d69d53598 (patch) | |
| tree | 23c5feaa79922c780ae9209a7b043d79517f970e /Library_merged.mk | |
| parent | 77169b9ceccfedeadef272f701425430cf1c719d (diff) | |
add lingucomponent libs to Library_merged
Change-Id: Ib34f589b377991b9e2d043d43ecf0360031ddae3
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index db8991dbf75e..651f608e7426 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -49,10 +49,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ endif $(eval $(call gb_Library_use_externals,merged,\ + $(if $(filter-out IOS,$(OS)),cdr) \ $(call gb_Helper_optional,DESKTOP,clucene) \ cppunit \ cups \ - $(call gb_Helper_optional,DESKTOP,expat_utf8) \ + expat_utf8 \ + hunspell \ + hyphen \ icui18n \ icule \ icuuc \ @@ -60,33 +63,23 @@ $(eval $(call gb_Library_use_externals,merged,\ lcms2 \ libxml2 \ $(call gb_Helper_optional,DESKTOP,libxslt) \ + $(if $(filter-out IOS,$(OS)),mspub) \ + $(if $(filter-out IOS,$(OS)),mwaw) \ + mythes \ nss3 \ openssl \ orcus \ - $(if $(filter-out IOS,$(OS)),\ - cdr \ - wpd \ - wpg \ - wps \ - mwaw \ - mspub \ - visio) \ + $(if $(filter-out IOS,$(OS)),wpd) \ + $(if $(filter-out IOS,$(OS)),wpg) \ + $(if $(filter-out IOS,$(OS)),wps) \ + $(if $(filter-out IOS,$(OS)),visio) \ zlib \ )) -# This would be needed on all platforms but only on android we merge libraries from lingucomponent -ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_use_externals,merged,\ - hunspell \ - expat_utf8 \ - mythes \ - hyphen \ -)) $(eval $(call gb_Library_use_static_libraries,merged,\ sax_shared \ ulingu \ )) -endif ifeq ($(ENABLE_GRAPHITE),TRUE) $(eval $(call gb_Library_use_externals,merged,\ @@ -167,10 +160,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ endif ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_use_static_libraries,merged,\ - basebmp \ -)) - $(eval $(call gb_Library_use_libraries,merged,\ libotouch \ )) |