diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-02-25 15:21:20 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-02-25 15:21:20 +0400 |
| commit | f8d55b5bf0e911161825836795d4f111581b9601 (patch) | |
| tree | 941b58cb37551f03ea49ddcf3cbd449cd78a83be | |
| parent | bbb77f58788fea1c8892fa3598193bdf9b971469 (diff) | |
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
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 75cb8eec338..9a1f9234d06 100644 --- a/SConstruct +++ b/SConstruct @@ -274,7 +274,7 @@ if 'blenderlite' in B.targets: # Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX 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'] 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" diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 78a19a1e81d..e9c7fb2aca8 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -34,7 +34,7 @@ elif cmd_res[:2]=='11': MAC_CUR_VER='10.7' cmd = 'xcodebuild -version' 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_sdk=commands.getoutput(cmd) MACOSX_SDK_CHECK=cmd_sdk |