mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The macavf code doesn't compile as 32-bit, sigh

Browse Source 
Change-Id: I51336c09aaa6ecdaa5da537a4a21efbff305da6e
This commit is contained in:
Tor Lillqvist 2014-05-15 19:45:13 +03:00
parent be1913aa1f
commit 2a9018b9f5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
avmedia/Module_avmedia.mk
View File

@ -44,12 +44,15 @@ endif
endif endif
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
ifeq ($(CPUNAME),X86_64)
# The macavf code is a bit x86_64 dependent...
ifneq (1060,$(MACOSX_SDK_VERSION)) ifneq (1060,$(MACOSX_SDK_VERSION))
$(eval $(call gb_Module_add_targets,avmedia,\ $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaMacAVF \ Library_avmediaMacAVF \
)) ))
endif endif
endif endif
endif
ifneq ($(ENABLE_DIRECTX),) ifneq ($(ENABLE_DIRECTX),)
$(eval $(call gb_Module_add_targets,avmedia,\ $(eval $(call gb_Module_add_targets,avmedia,\

2
postprocess/Rdb_services.mk
View File

@ -122,8 +122,10 @@ $(eval $(call gb_Rdb_add_components,services,\
writerperfect/source/writer/wpftwriter \ writerperfect/source/writer/wpftwriter \
$(if $(filter MACOSX,$(OS)), \ $(if $(filter MACOSX,$(OS)), \
$(if $(filter 1060,$(MACOSX_SDK_VERSION)),, \ $(if $(filter 1060,$(MACOSX_SDK_VERSION)),, \
$(if $(filter X86_64,$(CPUNAME)), \
$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
) \ ) \
) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
$(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
) \ ) \