Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-01-27 22:56:15 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-01-27 22:56:15 +0400
commit15e08394a0650ff1837124eea303340cc87d7879 (patch)
tree2f280ce2826b1815c92d46f44a59c13086d7e630 /intern/ghost/SConscript
parent623a550eec5c7ff3631d88cd3ef3f495cc7cd4d8 (diff)
OSX/scons: consequently make use of the recently introduced C_COMPILER_ID and CCVERSION env vars
Diffstat (limited to 'intern/ghost/SConscript')
-rw-r--r--intern/ghost/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index df4efe60a11..30a037a6818 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']: