diff options
| -rw-r--r-- | Library_merged.mk | 15 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 2a078945d3bc..c4b14a044729 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_library_objects,merged,\ )) $(eval $(call gb_Library_use_libraries,merged,\ + $(if $(filter unx,$(GUIBASE)),basebmp) \ basegfx \ comphelper \ cppu \ @@ -39,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ salhelper \ tl \ ucbhelper \ + unotest \ xmlreader \ $(gb_UWINAPI) \ )) @@ -50,6 +52,7 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ endif $(eval $(call gb_Library_use_externals,merged,\ + cppunit \ cups \ icui18n \ icule \ @@ -112,6 +115,18 @@ $(eval $(call gb_Library_add_libs,merged,\ )) endif +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_add_libs,merged,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) +$(eval $(call gb_Library_use_static_libraries,merged,\ + headless \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,merged,\ advapi32 \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 2217014050d3..60f71d726a6e 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -39,6 +39,7 @@ gb_MERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ deploymentmisc \ + $(if $(filter unx,$(GUIBASE)),desktop_detector) \ desktopbe1 \ drawinglayer \ editeng \ @@ -70,12 +71,14 @@ gb_MERGEDLIBS := \ sofficeapp \ sot \ spl \ + subsequenttest \ svl \ svt \ svx \ svxcore \ sw \ swd \ + test \ tk \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ @@ -84,6 +87,7 @@ gb_MERGEDLIBS := \ uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ + $(if $(filter unx,$(GUIBASE)),vclplug_svp) \ $(if $(filter-out IOS,$(OS)),wpftdraw) \ $(if $(filter-out IOS,$(OS)),wpftwriter) \ writerfilter \ |