archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OSX: preparing carbon and quicktime dropping, make 64bit and QTKit default, make 10.8sdk default for xcode >= 4.4

Browse Source
This commit is contained in:
jens verwiebe
2013-11-05 12:48:32 +00:00
parent 2cfe64cd10
commit dd697f8bd4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/scons/config/darwin-config.py
View File

@@ -14,7 +14,7 @@ USE_SDK=True
################### Cocoa & architecture settings ################## ################### Cocoa & architecture settings ##################
############################################################################# #############################################################################
WITH_GHOST_COCOA=True 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' cmd = 'uname -p'
@@ -97,7 +97,7 @@ else :
# OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! ) # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! )
MAC_MIN_VERS = '10.6' MAC_MIN_VERS = '10.6'
MACOSX_DEPLOYMENT_TARGET = '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' LCGDIR = '#../lib/darwin-9.x.universal'
CC = 'gcc' CC = 'gcc'
CXX = 'g++' CXX = 'g++'

2
build_files/scons/tools/btools.py
View File

@@ -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_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_XINPUT', 'Enable X11 Xinput (tablet support and unicode input)', True)),
(BoolVariable('WITH_X11_XF86VMODE', 'Enable X11 video mode switching', 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', ''), ('BF_OPENMP_LIB_STATIC', 'OpenMP static library', ''),
(BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)), (BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)),