[Bf-blender-cvs] [15e0839] master: OSX/scons: consequently make use of the recently introduced C_COMPILER_ID and CCVERSION env vars

[Jens Verwiebe]

Commit: 15e08394a0650ff1837124eea303340cc87d7879
Author: Jens Verwiebe
Date:   Mon Jan 27 19:56:15 2014 +0100
https://developer.blender.org/rB15e08394a0650ff1837124eea303340cc87d7879

OSX/scons: consequently make use of the recently introduced C_COMPILER_ID and  CCVERSION env vars

===================================================================

M	intern/ghost/SConscript
M	source/blender/quicktime/SConscript

===================================================================

diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index df4efe6..30a037a 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -138,7 +138,7 @@ if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-v
 if window_system in ('win32-vc', 'win64-vc'):
     env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') )
 
-elif window_system == 'darwin':	 # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
+elif window_system == 'darwin' and env['C_COMPILER_ID'] == 'gcc' and  env['CCVERSION'] >= '4.6': # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
     env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
     print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
     if env['WITH_BF_3DMOUSE']:
diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript
index 1fc2bc9..9b367a4 100644
--- a/source/blender/quicktime/SConscript
+++ b/source/blender/quicktime/SConscript
@@ -54,5 +54,7 @@ priorities = [200,235]
 
 defs=['WITH_QUICKTIME']
 
-env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') # always use default-Apple-gcc for objC language, gnu-compilers do not support it fully yet
-
+if env['C_COMPILER_ID'] == 'gcc' and  env['CCVERSION'] >= '4.6': # always use default-Apple-gcc for objC language, gnu-compilers do not support it fully yet
+    env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++')
+else:
+    env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities)