diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-08-04 23:29:12 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-04 23:54:40 +0300 |
| commit | a4e81b7c313e5cb0e0f23a8605502b4b0b7f599e (patch) | |
| tree | 7be4fdb2cf0ce580e5f16869ef0268accb705a7c | |
| parent | aabfbdbd8b096d4dfc31cb75aa6a119a19d705ef (diff) | |
No QuickTime in the 10.12 SDK
Finally. It has been documented as deprecated for years, after all.
Change-Id: Ia7f81639b2e0b313e0a8931f49c3902c5856339d
| -rw-r--r-- | avmedia/Module_avmedia.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index fb9497d512dc..a037b4d5d019 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -37,11 +37,13 @@ endif ifeq ($(OS),MACOSX) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) +ifneq ($(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaQuickTime \ )) endif endif +endif ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,avmedia,\ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 775022a659de..f56e55bccb67 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -127,7 +127,9 @@ $(eval $(call gb_Rdb_add_components,services,\ $(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/quicktime/avmediaQuickTime) \ + $(if $(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)), \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ + ) \ ) \ lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ fpicker/source/aqua/fps_aqua \ |