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 /Repository.mk | |
| 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 'Repository.mk')
| -rw-r--r-- | Repository.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 629f95354422..ec763106f30e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -324,10 +324,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ogltrans, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ acc \ - $(call gb_Helper_optional,AVMEDIA,avmedia) \ + avmedia \ + $(call gb_Helper_optional,AVMEDIA, \ $(if $(filter MACOSX,$(OS)),\ avmediaMacAVF \ ) \ + ) \ $(call gb_Helper_optional,SCRIPTING, \ basctl \ basprov \ @@ -593,8 +595,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ - $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ - $(if $(filter WNT,$(OS)),avmediawin) \ + $(call gb_Helper_optional,AVMEDIA, \ + $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ + $(if $(filter WNT,$(OS)),avmediawin) \ + ) \ cached1 \ collator_data \ comphelper \ @@ -1108,7 +1112,7 @@ $(eval $(call gb_ExternalExecutable_register_executables,\ # Resources $(eval $(call gb_Helper_register_mos,\ acc \ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ $(call gb_Helper_optional,SCRIPTING,basctl) \ chart \ cnr \ |