diff options
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 03a64792d191..89c37ff9fc8d 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -10,20 +10,25 @@ # we link all object files from these libraries into one, merged library MERGE_LIBRARY_LIST := \ avmedia \ + $(if $(filter WNT,$(OS)),avmediawin) \ $(call gb_Helper_optional,SCRIPTING, \ basctl \ + basprov \ ) \ basegfx \ + canvasfactory \ canvastools \ comphelper \ configmgr \ cppcanvas \ $(call gb_Helper_optional,BREAKPAD,crashreport) \ + ctl \ dbtools \ deployment \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(USING_X11),desktop_detector) \ + $(if $(filter WNT,$(OS)),directx9canvas) \ drawinglayer \ editeng \ filterconfig \ |