sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OSX/scons: take xcode-select path into account, to work well with different xcode versions

Browse Source
This commit is contained in:
Jens Verwiebe 2013-09-13 15:41:18 +00:00
parent 3596ab932c
commit 13263541ec
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,12 @@ XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
cmd = 'xcodebuild -showsdks'
cmd_sdk=commands.getoutput(cmd)
MACOSX_SDK_CHECK=cmd_sdk
cmd = 'xcode-select --print-path'
XCODE_SELECT_PATH=commands.getoutput(cmd)
if XCODE_SELECT_PATH.endswith("/Contents/Developer"):
XCODE_BUNDLE=XCODE_SELECT_PATH[:-19]
else:
XCODE_BUNDLE=XCODE_SELECT_PATH
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
USE_QTKIT=True # Carbon quicktime is not available for 64bit
@ -99,7 +105,7 @@ else :
LIBDIR = '${LCGDIR}'
if XCODE_CUR_VER >= '4.3': ## since version 4.3, XCode and developer dir are bundled ##
MACOSX_SDK = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
MACOSX_SDK = XCODE_BUNDLE + '/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
#############################################################################
################### Dependency settings ##################