archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Buildbot: disable command length workaround for now, seems to give link errors.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-06-25 00:49:43 +00:00
parent d54b2391c4
commit 54db7f1b43
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/compositor/SConscript
View File

@@ -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])