diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-05-15 19:24:19 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-05-15 19:26:52 +0300 |
commit | 0a829b062ce710e75aff89543d88898a1733f8fd (patch) | |
tree | 79a28a4ab25df1e2db7366c33c0c591a3aa5359d | |
parent | 75c804c1be8acf4c3fc9935b81e696918f33fd9d (diff) |
The AVFoundation framework appeared in OS X 10.7
Change-Id: I76eb213ff4cb93196ea81dd43a465da61c0cdee2
-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 f0108e5fcb77..bd0382d13770 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -44,10 +44,12 @@ endif endif ifeq ($(OS),MACOSX) +ifneq (1060,$(MACOSX_SDK_VERSION)) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaMacAVF \ )) endif +endif ifneq ($(ENABLE_DIRECTX),) $(eval $(call gb_Module_add_targets,avmedia,\ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 5470902d039f..9ebe6d282e44 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -121,7 +121,9 @@ $(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 1060,$(MACOSX_SDK_VERSION)),, \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ + ) \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ ) \ |