diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-18 01:11:41 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-01 16:50:23 +0100 |
| commit | f9e79a91f15e10ededad0f103c4ffe0ca38fcb31 (patch) | |
| tree | 6bd058d7bc28fa48d2ae510f958beb617d1b2bb5 /postprocess | |
| parent | b8084b0dee7d28f4fc8fa92eae6171880ac3a9c8 (diff) | |
Fix --disable-avmedia for DESKTOP build
Probably additional bits can be removed, but this now passes.
Change-Id: I366bec43cfd6fb02e914c85c711b3b19586d534d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126161
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/Rdb_services.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index aea72437c4f9..06ce007d4cd7 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -158,21 +158,19 @@ $(eval $(call gb_Rdb_add_components,services,\ lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ ) \ $(if $(filter WNT,$(OS)), \ - avmedia/source/win/avmediawin \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/win/avmediawin) \ + embeddedobj/source/msole/emboleobj.windows \ + embedserv/util/emser \ + extensions/source/ole/oleautobridge \ fpicker/source/win32/fps \ shell/source/backends/wininetbe/wininetbe1 \ shell/source/win32/simplemail/smplmail \ shell/source/win32/syssh \ + winaccessibility/source/service/winaccessibility \ ) \ $(if $(filter-out WNT,$(OS)), \ embeddedobj/source/msole/emboleobj \ ) \ - $(if $(filter WNT,$(OS)), \ - embeddedobj/source/msole/emboleobj.windows \ - embedserv/util/emser \ - extensions/source/ole/oleautobridge \ - winaccessibility/source/service/winaccessibility \ - ) \ $(if $(filter neon,$(WITH_WEBDAV)), \ ucb/source/ucp/webdav-neon/ucpdav1 \ ) \ @@ -205,7 +203,7 @@ $(eval $(call gb_Rdb_add_components,services,\ ucb/source/ucp/gio/ucpgio \ ) \ $(if $(ENABLE_GSTREAMER_1_0), \ - avmedia/source/gstreamer/avmediagstreamer \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/gstreamer/avmediagstreamer) \ ) \ $(if $(ENABLE_KF5), \ shell/source/backends/kf5be/kf5be1 \ |