summaryrefslogtreecommitdiff
path: root/scp2
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 /scp2
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 'scp2')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp2
1 files changed, 0 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index fa610872e05c..6c27cf290584 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -108,13 +108,11 @@ File gid_File_Lib_avmediaQuickTime
End
#if MAXOSX_SDK_VERSION >= 1070
-#ifdef X86_64
File gid_File_Lib_avmediaMacAVF
PACKED_LIB_FILE_BODY;
Name = LIBNAME(avmediaMacAVF);
End
#endif
-#endif
#endif