diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-27 22:56:15 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-27 22:56:15 +0400 |
| commit | 15e08394a0650ff1837124eea303340cc87d7879 (patch) | |
| tree | 2f280ce2826b1815c92d46f44a59c13086d7e630 /source/blender/quicktime | |
| parent | 623a550eec5c7ff3631d88cd3ef3f495cc7cd4d8 (diff) | |
OSX/scons: consequently make use of the recently introduced C_COMPILER_ID and CCVERSION env vars
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index 1fc2bc96b21..9b367a434f2 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) |