diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-05 16:48:32 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-05 16:48:32 +0400 |
| commit | dd697f8bd40b685de2c3ba87866aaf2785a27308 (patch) | |
| tree | 2f3b7c45a86d19ff27e318f3d45965ab9c70071c /build_files | |
| parent | 2cfe64cd1037552dc1a0971c3996dbbe57aad1bb (diff) | |
OSX: preparing carbon and quicktime dropping, make 64bit and QTKit default, make 10.8sdk default for xcode >= 4.4
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 4 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 5a1069618b9..1ded1af9976 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -14,7 +14,7 @@ USE_SDK=True ################### Cocoa & architecture settings ################## ############################################################################# WITH_GHOST_COCOA=True -MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 +MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64 cmd = 'uname -p' @@ -97,7 +97,7 @@ else : # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! ) MAC_MIN_VERS = '10.6' MACOSX_DEPLOYMENT_TARGET = '10.6' - MACOSX_SDK='/Developer/SDKs/MacOSX10.7.sdk' + MACOSX_SDK='/Developer/SDKs/MacOSX10.8.sdk' LCGDIR = '#../lib/darwin-9.x.universal' CC = 'gcc' CXX = 'g++' diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 8f0d3ff590b..7b1737a1e70 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -428,7 +428,7 @@ def read_opts(env, cfg, args): (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)), - (BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)), + (BoolVariable('USE_QTKIT', 'Use QTKIT if true', True)), ('BF_OPENMP_LIB_STATIC', 'OpenMP static library', ''), (BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)), |