diff options
| -rw-r--r-- | avmedia/Module_avmedia.mk | 3 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index bd0382d13770..06bbef7a1bd1 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -44,12 +44,15 @@ endif endif ifeq ($(OS),MACOSX) +ifeq ($(CPUNAME),X86_64) +# The macavf code is a bit x86_64 dependent... 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 9ebe6d282e44..750fafeabd33 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -122,7 +122,9 @@ $(eval $(call gb_Rdb_add_components,services,\ writerperfect/source/writer/wpftwriter \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter 1060,$(MACOSX_SDK_VERSION)),, \ - $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ + $(if $(filter X86_64,$(CPUNAME)), \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ + ) \ ) \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ |