[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60113] trunk/blender/build_files/scons/ config/darwin-config.py: OSX/scons: take xcode-select path into account, to work well with different xcode versions

jens verwiebe info at jensverwiebe.de
Fri Sep 13 17:41:18 CEST 2013


Revision: 60113
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60113
Author:   jensverwiebe
Date:     2013-09-13 15:41:18 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
OSX/scons: take xcode-select path into account, to work well with different xcode versions

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/darwin-config.py

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2013-09-13 15:18:17 UTC (rev 60112)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-09-13 15:41:18 UTC (rev 60113)
@@ -42,6 +42,12 @@
 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 @@
 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           ##################




More information about the Bf-blender-cvs mailing list