From 52588bf014352d808ec139ab121b63f3a671fd33 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 5 Nov 2013 12:52:51 +0000 Subject: OSX: preparing carbon and quicktime dropping, make QTKit also default for i386 --- build_files/scons/config/darwin-config.py | 2 +- build_files/scons/tools/btools.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files') diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 1ded1af9976..d44b94e42b5 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -49,7 +49,7 @@ if XCODE_SELECT_PATH.endswith("/Contents/Developer"): else: XCODE_BUNDLE=XCODE_SELECT_PATH -if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': +if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'ppc64': USE_QTKIT=True # Carbon quicktime is not available for 64bit diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 7b1737a1e70..9a5521fff44 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -424,7 +424,7 @@ def read_opts(env, cfg, args): ('BF_OPENMP', 'Base path to OpenMP (used when cross-compiling with older versions of WinGW)', ''), ('BF_OPENMP_INC', 'Path to OpenMP includes (used when cross-compiling with older versions of WinGW)', ''), ('BF_OPENMP_LIBPATH', 'Path to OpenMP libraries (used when cross-compiling with older versions of WinGW)', ''), - (BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', False)), + (BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', True)), (BoolVariable('WITH_GHOST_SDL', 'Enable building blender against SDL for windowing rather then the native APIs', False)), (BoolVariable('WITH_X11_XINPUT', 'Enable X11 Xinput (tablet support and unicode input)', True)), (BoolVariable('WITH_X11_XF86VMODE', 'Enable X11 video mode switching', True)), -- cgit v1.2.3