diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 04:49:43 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 04:49:43 +0400 |
| commit | 54db7f1b43b08f3bfd0ce28b24f8ed22e82282cf (patch) | |
| tree | fbfe78a18ab66b48854c4cda2020df284c16c21b /source/blender/compositor/SConscript | |
| parent | d54b2391c4b0c862aa4991f467bf724bb811048e (diff) | |
Buildbot: disable command length workaround for now, seems to give link errors.
Diffstat (limited to 'source/blender/compositor/SConscript')
| -rw-r--r-- | source/blender/compositor/SConscript | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/compositor/SConscript b/source/blender/compositor/SConscript index d40015cf9d3..073b100e156 100644 --- a/source/blender/compositor/SConscript +++ b/source/blender/compositor/SConscript @@ -28,7 +28,6 @@ Import ('env') defs = ['GLEW_STATIC'] -# split into 3 modules to work around command length limit on Windows sources_intern = env.Glob('intern/*.cpp') sources_nodes = env.Glob('nodes/*.cpp') sources_operations = env.Glob('operations/*.cpp') @@ -59,7 +58,13 @@ incs = [ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs.append(env['BF_PTHREADS_INC']) -env.BlenderLib('bf_composite_intern', sources_intern, incs, defines=defs, libtype=['core'], priority=[166]) -env.BlenderLib('bf_composite_nodes', sources_nodes, incs, defines=defs, libtype=['core'], priority=[165]) -env.BlenderLib('bf_composite_operations', sources_operations, incs, defines=defs, libtype=['core'], priority=[164]) +if False: # gives link errors 'win' in env['OURPLATFORM']: + # split into 3 modules to work around command length limit on Windows + env.BlenderLib('bf_composite_intern', sources_intern, incs, defines=defs, libtype=['core'], priority=[166]) + env.BlenderLib('bf_composite_nodes', sources_nodes, incs, defines=defs, libtype=['core'], priority=[165]) + env.BlenderLib('bf_composite_operations', sources_operations, incs, defines=defs, libtype=['core'], priority=[164]) +else: + sources = sources_intern + sources_nodes + sources_operations + env.BlenderLib('bf_composite', sources, incs, defines=defs, libtype=['core'], priority=[164]) + |