forked from bartvdbraak/blender
Buildbot: disable command length workaround for now, seems to give link errors.
This commit is contained in:
parent
d54b2391c4
commit
54db7f1b43
@ -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])
|
||||
|
||||
|
||||
|
@ -78,11 +78,14 @@ sources = system_sources + image_sources + geometry_sources + scene_graph_source
|
||||
winged_edge_sources + view_map_sources + stroke_sources + \
|
||||
application_sources + interface_sources
|
||||
|
||||
if False: # gives link errors 'win' in env['OURPLATFORM']:
|
||||
env.BlenderLib(libname="bf_freestyle_python", sources=python_sources, includes=Split(incs),
|
||||
defines=defs, libtype=['core'], priority = [369] # bf_python is 361
|
||||
)
|
||||
else:
|
||||
sources += python_sources
|
||||
|
||||
env.BlenderLib(libname="bf_freestyle", sources=sources, includes=Split(incs),
|
||||
defines=defs, libtype=['core'], priority = [370]
|
||||
)
|
||||
|
||||
env.BlenderLib(libname="bf_freestyle_python", sources=python_sources, includes=Split(incs),
|
||||
defines=defs, libtype=['core'], priority = [369] # bf_python is 361
|
||||
defines=defs, libtype=['core'], priority = [370] # bf_python is 361
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user