From 99c5e713970859640a9e46c2afeeff9d5235f624 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 6 Nov 2013 01:45:15 +0000 Subject: Quicktime: remove backend with the old quicktime API, and keep the QTKit backend. This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled, it will always use QTKit. The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will give consistent input/output. On Windows or Linux quicktime isn't being used. --- intern/ghost/SConscript | 3 --- 1 file changed, 3 deletions(-) (limited to 'intern/ghost/SConscript') diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 03868bb8b11..df4efe60a11 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -98,8 +98,6 @@ elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64 elif window_system == 'darwin': if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') - if env['USE_QTKIT']: - defs.append('USE_QTKIT') for f in pf: try: sources.remove('intern' + os.sep + f + 'Win32.cpp') @@ -107,7 +105,6 @@ elif window_system == 'darwin': sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass - else: print "Unknown window system specified." Exit() -- cgit v1.2.3