forked from bartvdbraak/blender
OSX/scons: take xcode-select path into account, to work well with different xcode versions
This commit is contained in:
parent
3596ab932c
commit
13263541ec
@ -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 ##################
|
||||
|
Loading…
Reference in New Issue
Block a user