diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-11-06 05:45:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-11-06 05:45:15 +0400 |
| commit | 99c5e713970859640a9e46c2afeeff9d5235f624 (patch) | |
| tree | dd9a6ba6d4cb49a6db9f2ddf3d6552ea5496f3e4 /build_files/buildbot/config | |
| parent | 299812f28d32950a9bbf4612a3a5fef46054e7fb (diff) | |
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.
Diffstat (limited to 'build_files/buildbot/config')
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-i386.py | 6 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-x86_64.py | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index cdc3eded5ee..7242289e109 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -45,6 +45,7 @@ if XCODE_SELECT_PATH.endswith("/Contents/Developer"): else: XCODE_BUNDLE=XCODE_SELECT_PATH + # Default target OSX settings per architecture # Can be customized @@ -332,10 +333,7 @@ CPPFLAGS = list(ARCH_FLAGS) PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS if WITH_BF_QUICKTIME: - if USE_QTKIT: - PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit'] - else: - PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] + PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit'] if not WITH_OSX_STATICPYTHON: PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python'] diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py index 024d01c78a2..4324ecbe2b4 100644 --- a/build_files/buildbot/config/user-config-mac-x86_64.py +++ b/build_files/buildbot/config/user-config-mac-x86_64.py @@ -45,6 +45,7 @@ if XCODE_SELECT_PATH.endswith("/Contents/Developer"): else: XCODE_BUNDLE=XCODE_SELECT_PATH + # Default target OSX settings per architecture # Can be customized @@ -332,10 +333,7 @@ CPPFLAGS = list(ARCH_FLAGS) PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS if WITH_BF_QUICKTIME: - if USE_QTKIT: - PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit'] - else: - PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] + PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit'] if not WITH_OSX_STATICPYTHON: PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python'] |