Skip to content

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

Add comphelper to libmerged 

Change-Id: I59af9f5a9d0d3e189280f98bb18e522dc9ebf2fb
üst c6122fe6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
Library_merged.mk
Dosyayı görüntüle @ 8668e044
...@@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\ ...@@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\
)) ))
$(eval $(call gb_Library_use_libraries,merged,\ $(eval $(call gb_Library_use_libraries,merged,\
comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
i18nlangtag \ i18nlangtag \
......
solenv/gbuild/LinkTarget.mk
Dosyayı görüntüle @ 8668e044
...@@ -818,6 +818,7 @@ endef ...@@ -818,6 +818,7 @@ endef
# libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS # libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS
gb_BUILD_HELPER_LIBS := basegfx \ gb_BUILD_HELPER_LIBS := basegfx \
comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
reg \ reg \
......
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @ 8668e044
...@@ -14,6 +14,7 @@ MERGE_LIBRARY_LIST := \ ...@@ -14,6 +14,7 @@ MERGE_LIBRARY_LIST := \
$(if $(filter $(OS),ANDROID),,basebmp) \ $(if $(filter $(OS),ANDROID),,basebmp) \
basegfx \ basegfx \
canvastools \ canvastools \
comphelper \
configmgr \ configmgr \
cppcanvas \ cppcanvas \
$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
......
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