diff options
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | config/darwin-config.py | 15 | ||||
| -rw-r--r-- | source/blender/quicktime/SConscript | 8 | ||||
| -rwxr-xr-x | tools/btools.py | 2 |
4 files changed, 23 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index e6dd85e8cff..369a1801aec 100644 --- a/SConstruct +++ b/SConstruct @@ -224,6 +224,11 @@ if env['WITH_GHOST_COCOA'] == True: env.Append(CFLAGS=['-DGHOST_COCOA']) env.Append(CXXFLAGS=['-DGHOST_COCOA']) env.Append(CPPFLAGS=['-DGHOST_COCOA']) + +if env['USE_QTKIT'] == True: + env.Append(CFLAGS=['-DUSE_QTKIT']) + env.Append(CXXFLAGS=['-DUSE_QTKIT']) + env.Append(CPPFLAGS=['-DUSE_QTKIT']) #check for additional debug libnames diff --git a/config/darwin-config.py b/config/darwin-config.py index 249598e8a47..825d00f892d 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -13,7 +13,6 @@ USE_SDK=True ############################################################################# ################### Cocoa & architecture settings ################## ############################################################################# - WITH_GHOST_COCOA=True MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 @@ -33,6 +32,10 @@ elif cmd_res[0]=='10': BF_PYTHON_VERSION = '3.1' +if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': + USE_QTKIT=True # Carbon quicktime is not available for 64bit + + # Default target OSX settings per architecture # Can be customized @@ -231,10 +234,7 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' -if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': - WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME ( disable for 64bit atm ) -else: - WITH_BF_QUICKTIME = True +WITH_BF_QUICKTIME = True WITH_BF_ICONV = True BF_ICONV = '/usr' @@ -287,7 +287,10 @@ else: PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS if WITH_BF_QUICKTIME == True: - PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] + if USE_QTKIT == True: + PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit'] + else: + PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 LLIBS = ['stdc++', 'SystemStubs'] diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index 10e88a8f461..1f9847d7854 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -1,9 +1,15 @@ #!/usr/bin/python Import ('env') -source_files = ['apple/quicktime_import.c', + +if env['USE_QTKIT']: + source_files = ['apple/qtkit_import.m', + 'apple/qtkit_export.m'] +else: + source_files = ['apple/quicktime_import.c', 'apple/quicktime_export.c'] + incs = ['.', '../quicktime', '../makesdna', diff --git a/tools/btools.py b/tools/btools.py index 326c0412cea..e34ee05fbe7 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -65,6 +65,7 @@ def validate_arguments(args, bc): 'WITHOUT_BF_PYTHON_INSTALL', 'WITH_BF_OPENMP', 'WITH_GHOST_COCOA', + 'USE_QTKIT', 'BF_FANCY', 'BF_QUIET', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG', @@ -314,6 +315,7 @@ def read_opts(cfg, args): (BoolVariable('WITH_BF_OPENMP', 'Use OpenMP if true', False)), (BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', False)), + (BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)), (BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)), ('BF_QUICKTIME', 'QuickTime base path', ''), |