diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-02-17 19:39:03 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-02-17 19:39:03 +0400 |
| commit | fc9215129e27d5fd96ee7159e2ff63570e4b16e8 (patch) | |
| tree | 0fdb88188969c035d2dc77b46643ef94469052e5 /source/blender/ikplugin | |
| parent | 209a68af39f23e61e2958a458fd280a26aa92f37 (diff) | |
Adapt KDL for compile with clang 3.4, which is stricter with friend classes,
fixes ‘friend declaration specifying a default argument must be a definition’,
based on information from here:
http://www.orocos.org/forum/rtt/rtt-dev/bug-1053-new-compile-error-clang-34-patch-attached
Diffstat (limited to 'source/blender/ikplugin')
| -rw-r--r-- | source/blender/ikplugin/SConscript | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/ikplugin/SConscript b/source/blender/ikplugin/SConscript index ec19b9a250a..4a4cb4f2cbd 100644 --- a/source/blender/ikplugin/SConscript +++ b/source/blender/ikplugin/SConscript @@ -46,7 +46,4 @@ defs = [ 'WITH_IK_SOLVER', ] -if env['OURPLATFORM']=='darwin' and env['C_COMPILER_ID'] == 'clang' and env['CCVERSION'] >= '3.4': # workaround for friend declaration specifies a default argument expression, not allowed anymore - env.BlenderLib('bf_ikplugin', sources, incs, defs, libtype=['core', 'player'], priority=[180, 190], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') -else: - env.BlenderLib('bf_ikplugin', sources, incs, defs, libtype=['core', 'player'], priority=[180, 190]) +env.BlenderLib('bf_ikplugin', sources, incs, defs, libtype=['core', 'player'], priority=[180, 190]) |