[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61164] trunk/blender/build_files/scons/ config/darwin-config.py: OSX/scons: more cleanup of redundant vars, preparation to remove local vars to not need to cp whole config as user-config later

[jens verwiebe]

Revision: 61164
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61164
Author:   jensverwiebe
Date:     2013-11-06 13:56:11 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
OSX/scons: more cleanup of redundant vars, preparation to remove local vars to not need to cp whole config as user-config later

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-11-06 12:52:09 UTC (rev 61163)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-11-06 13:56:11 UTC (rev 61164)
@@ -40,29 +40,22 @@
 
 if 'Mac OS X 10.5' in MACOSX_SDK_CHECK:
 	# OSX 10.5/6 with Xcode 3.x
-	MAC_MIN_VERS = '10.5'
 	MACOSX_DEPLOYMENT_TARGET = '10.5'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
-	LCGDIR = '#../lib/darwin-9.x.universal'
-	CC = 'gcc-4.2'
-	CXX = 'g++-4.2'
 elif 'Mac OS X 10.6' in MACOSX_SDK_CHECK:
 	# OSX 10.6/7 with Xcode 4.x
-	MAC_MIN_VERS = '10.6'
 	MACOSX_DEPLOYMENT_TARGET = '10.6'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
-	LCGDIR = '#../lib/darwin-9.x.universal'
-	CC = 'gcc-4.2'
-	CXX = 'g++-4.2'
 else:
-	# OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! )
-	MAC_MIN_VERS = '10.6'
+	# OSX 10.7/8/9 with Xcode 4.4 and higher (no 10.6sdk! )
 	MACOSX_DEPLOYMENT_TARGET = '10.6'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.8.sdk'
-	LCGDIR = '#../lib/darwin-9.x.universal'
-	CC = 'gcc'
-	CXX = 'g++'
 
+MAC_MIN_VERS = MACOSX_DEPLOYMENT_TARGET
+# gcc always defaults to the system standard compiler linked by a shim or symlink
+CC = 'gcc'
+CXX = 'g++'
+LCGDIR = '#../lib/darwin-9.x.universal'
 LIBDIR = '${LCGDIR}'
 
 if XCODE_CUR_VER >= '4.3':  ## since version 4.3, XCode and developer dir are bundled ##