summaryrefslogtreecommitdiff
path: root/postprocess
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-05-16 10:59:13 +0300
committerTor Lillqvist <tml@collabora.com>2014-05-16 12:43:03 +0300
commit7822b5535cccc68e5b454d04a66a6b4f27675ec6 (patch)
tree00b0d6aa828a845484c0b3251a9cfd796d26a73f /postprocess
parent97d50c425f83f05bb395956e1f855db00b979f27 (diff)
Make the MacAVF code build also as 32-bit
When compiling 32-bit OS X code, the code will use the "legacy Objective-C runtime", which means that instance variables of an Objective-C class must be declared in the @interface block, not in the @implementation. CGRect and NSRect are not the same for 32-bit code. Also, use boost::unordered_map. Change-Id: Icc56ff298203565a7568714b0e9f42c7c6b89737
Diffstat (limited to 'postprocess')
-rw-r--r--postprocess/Rdb_services.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 750fafeabd33..9ebe6d282e44 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_Rdb_add_components,services,\
writerperfect/source/writer/wpftwriter \
$(if $(filter MACOSX,$(OS)), \
$(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)),, \
$(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \