Skip to content

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

add pyuno and pythonloader to Library_merged 

Change-Id: Ib2bde93f7f99873c4c2f4d3857bb1ed5e3e7fd8a
üst b2700663
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
Library_merged.mk
Dosyayı görüntüle @ b49c71ff
...@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,merged,\ ...@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,merged,\
nss3 \ nss3 \
openssl \ openssl \
orcus \ orcus \
$(call gb_Helper_optional,PYUNO,python) \
$(if $(filter-out IOS,$(OS)),wpd) \ $(if $(filter-out IOS,$(OS)),wpd) \
$(if $(filter-out IOS,$(OS)),wpg) \ $(if $(filter-out IOS,$(OS)),wpg) \
$(if $(filter-out IOS,$(OS)),wps) \ $(if $(filter-out IOS,$(OS)),wps) \
......
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @ b49c71ff
...@@ -89,6 +89,8 @@ gb_MERGEDLIBS := \ ...@@ -89,6 +89,8 @@ gb_MERGEDLIBS := \
oox \ oox \
package2 \ package2 \
pricing \ pricing \
$(call gb_Helper_optional,PYUNO,pythonloader) \
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
$(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \
$(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \
......
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