diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-05-15 18:57:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-05-15 19:00:49 +0300 |
| commit | c0a3bc0570439bad6f2e105cb38b4bd073839e05 (patch) | |
| tree | bec308f6a710d00dbe02b43ffcde4204cc60d54c | |
| parent | ec08cb1f81d47e8f41778bf519ead43bfb90e67c (diff) | |
The AVMedia framework is not deprecated
So no reason to avoid it when building for the Mac App Store
(i.e. when building a sandboxed LibreOffice). (At least I assume it
was because of the deprecatedness of QuickTime that it was conditional
on not building a sandboxed LibreOffice.)
Change-Id: I9d50490aa878ba5e40594b39eac88f23df3ef0a6
| -rw-r--r-- | avmedia/Module_avmedia.mk | 7 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 6046ab5d4e2a..f0108e5fcb77 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -38,12 +38,17 @@ endif ifeq ($(OS),MACOSX) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) $(eval $(call gb_Module_add_targets,avmedia,\ - Library_avmediaMacAVF \ Library_avmediaQuickTime \ )) endif endif +ifeq ($(OS),MACOSX) +$(eval $(call gb_Module_add_targets,avmedia,\ + Library_avmediaMacAVF \ +)) +endif + ifneq ($(ENABLE_DIRECTX),) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediawin \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index b22a9d792d8c..5470902d039f 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -121,8 +121,8 @@ $(eval $(call gb_Rdb_add_components,services,\ writerperfect/source/impress/wpftimpress \ writerperfect/source/writer/wpftwriter \ $(if $(filter MACOSX,$(OS)), \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ - $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ ) \ lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ |