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

OSX: scons: fix own mistake, truncate output of xcode-build -version to major.minor version in config to change the var not only the print

Browse Source
This commit is contained in:
Jens Verwiebe 2012-02-25 11:21:20 +00:00
parent bbb77f5878
commit f8d55b5bf0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -274,7 +274,7 @@ if 'blenderlite' in B.targets:
# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX # Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
if env['OURPLATFORM']=='darwin': if env['OURPLATFORM']=='darwin':
print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][6:][:3] + " --" print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
print "Available " + env['MACOSX_SDK_CHECK'] print "Available " + env['MACOSX_SDK_CHECK']
if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']: if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
print B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + " using MacOSX10.6.sdk" print B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + " using MacOSX10.6.sdk"

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

@ -34,7 +34,7 @@ elif cmd_res[:2]=='11':
MAC_CUR_VER='10.7' MAC_CUR_VER='10.7'
cmd = 'xcodebuild -version' cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd) cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
cmd = 'xcodebuild -showsdks' cmd = 'xcodebuild -showsdks'
cmd_sdk=commands.getoutput(cmd) cmd_sdk=commands.getoutput(cmd)
MACOSX_SDK_CHECK=cmd_sdk MACOSX_SDK_CHECK=cmd_sdk