Skip to content

C
core
Kaydet (Commit) 7931b6d3 authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

Fix dependencies for libmerged wrt. libsofficeapp 

Change-Id: If1575e0bcacbc5c3c40d485063b1025017eef73a
üst f4e35c5c
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
desktop/Library_sofficeapp.mk
Dosyayı görüntüle @ 7931b6d3
...@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ...@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
sfx \ sfx \
svl \ svl \
svt \ svt \
sw \
tk \ tk \
tl \ tl \
ucbhelper \ ucbhelper \
......
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @ 7931b6d3
...@@ -108,6 +108,7 @@ gb_EXTRAMERGEDLIBS := \ ...@@ -108,6 +108,7 @@ gb_EXTRAMERGEDLIBS := \
# we link all object files from these libraries into one, merged library # we link all object files from these libraries into one, merged library
gb_MERGEDLIBS := \ gb_MERGEDLIBS := \
avmedia \ avmedia \
$(if $(filter $(OS),ANDROID),,basebmp) \
basegfx \ basegfx \
canvastools \ canvastools \
configmgr \ configmgr \
...@@ -152,6 +153,9 @@ gb_MERGEDLIBS := \ ...@@ -152,6 +153,9 @@ gb_MERGEDLIBS := \
uui \ uui \
vcl \ vcl \
vclopengl \ vclopengl \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
$(if $(ENABLE_HEADLESS),,vclplug_svp) \
) \
xmlscript \ xmlscript \
xo \ xo \
xstor \ xstor \
......
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