Skip to content

C
core
Kaydet (Commit) 03b53744 authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

add wpftwriter to Library_merged 

Change-Id: Id748b3bb2347bf8e8d63a47ff8471e3185cbedcb
üst ba22038b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
Library_merged.mk
Dosyayı görüntüle @ 03b53744
...@@ -43,6 +43,12 @@ $(eval $(call gb_Library_use_libraries,merged,\ ...@@ -43,6 +43,12 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
ifneq ($(OS),IOS)
$(eval $(call gb_Library_use_static_libraries,merged,\
writerperfect \
))
endif
$(eval $(call gb_Library_use_externals,merged,\ $(eval $(call gb_Library_use_externals,merged,\
cups \ cups \
icui18n \ icui18n \
...@@ -52,6 +58,12 @@ $(eval $(call gb_Library_use_externals,merged,\ ...@@ -52,6 +58,12 @@ $(eval $(call gb_Library_use_externals,merged,\
lcms2 \ lcms2 \
libxml2 \ libxml2 \
nss3 \ nss3 \
$(if $(filter-out IOS,$(OS)),\
wpd \
wpg \
wps \
mwaw \
) \
zlib \ zlib \
)) ))
......
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @ 03b53744
...@@ -71,6 +71,7 @@ gb_MERGEDLIBS := \ ...@@ -71,6 +71,7 @@ gb_MERGEDLIBS := \
uui \ uui \
$(if $(DISABLE_SCRIPTING),,vbahelper) \ $(if $(DISABLE_SCRIPTING),,vbahelper) \
vcl \ vcl \
$(if $(filter-out IOS,$(OS)),wpftwriter) \
xmlscript \ xmlscript \
xo \ xo \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment