diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2014-07-02 19:43:12 -0400 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-07-07 15:58:53 +0000 |
| commit | b536cabf97288061d7b91e131b16d2a525352571 (patch) | |
| tree | 09d9340e46c302203739763ef99b6a27cd2e4cc2 | |
| parent | 08818d8a45e034ad825c7fafbb76766f106f1d1d (diff) | |
fix build errors related to AVFoundation @ OS X <10.7
AVFoundation framework is available in OS X v10.7 and later
related commits:
7822b5535cccc68e5b454d04a66a6b4f27675ec6
0b49cc5b03b39aa1dfddf924c6eaf8cb42e791a8
Change-Id: If771fca79c41d70e51eab533faec7bb9997803b7
Reviewed-on: https://gerrit.libreoffice.org/9769
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | avmedia/Module_avmedia.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index 1c4298b1119e..53d124b700e5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -228,7 +228,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ acc \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ $(if $(filter MACOSX,$(OS)),\ - $(if $(filter-out 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \ + $(if $(filter-out 1050 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \ $(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \ ) \ $(if $(DISABLE_SCRIPTING),,basctl) \ diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index bd0382d13770..6a97e69cc691 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -44,12 +44,14 @@ endif endif ifeq ($(OS),MACOSX) +ifneq (1050,$(MACOSX_SDK_VERSION)) ifneq (1060,$(MACOSX_SDK_VERSION)) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaMacAVF \ )) endif 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 a1fe9bc3d8e6..98667ad8eb11 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -122,7 +122,7 @@ $(eval $(call gb_Rdb_add_components,services,\ writerperfect/source/writer/wpftwriter \ writerperfect/source/calc/wpftcalc \ $(if $(filter MACOSX,$(OS)), \ - $(if $(filter 1060,$(MACOSX_SDK_VERSION)),, \ + $(if $(filter 1050 1060,$(MACOSX_SDK_VERSION)),, \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ ) \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ |