03d3527ef7
Resolved the 'inconsistent newlines' merge error by updating my svn client. The error was caused by a bug in svn client (http://subversion.tigris.org/issues/show_bug.cgi?id=3262) that was fixed in 1.5.5. Fixed conflicts in image.c, object_edit.c, wm_operators.c, source/creator/CMakeLists.txt and CMakeLists.txt. Merge didn't remove some files that were moved/renamed in trunk, svn reported 'Skipped [filename]' on these files. I removed them with: svn --force remove release/io svn --force remove release/ui svn --force remove source/blender/editors/preview svn --force remove source/blender/editors/physics/ed_fluidsim.c svn --force remove source/blender/editors/physics/editparticle.c svn --force remove source/blender/editors/physics/ed_pointcache.c svn --force remove source/blender/editors/mesh/mesh_layers.c Now, before merging into trunk, need to update collada code so it builds ok and fix the possibility to build without collada.
39 lines
1011 B
Python
39 lines
1011 B
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
import sys
|
|
|
|
SConscript(['avi/SConscript',
|
|
'blenkernel/SConscript',
|
|
'blenlib/SConscript',
|
|
'blenloader/SConscript',
|
|
'blenpluginapi/SConscript',
|
|
'gpu/SConscript',
|
|
'editors/SConscript',
|
|
'imbuf/SConscript',
|
|
'imbuf/intern/cineon/SConscript',
|
|
'makesdna/SConscript',
|
|
'makesrna/SConscript',
|
|
'readblenfile/SConscript',
|
|
'render/SConscript',
|
|
'nodes/SConscript',
|
|
'ikplugin/SConscript',
|
|
'windowmanager/SConscript',
|
|
'blenfont/SConscript'])
|
|
|
|
|
|
|
|
if env['WITH_BF_PYTHON']:
|
|
SConscript(['python/SConscript'])
|
|
|
|
if env['WITH_BF_DDS']:
|
|
SConscript (['imbuf/intern/dds/SConscript'])
|
|
|
|
if env['WITH_BF_OPENEXR']:
|
|
SConscript (['imbuf/intern/openexr/SConscript'])
|
|
|
|
if env['WITH_BF_QUICKTIME']:
|
|
SConscript (['quicktime/SConscript'])
|
|
|
|
if env['WITH_BF_COLLADA']:
|
|
SConscript (['collada/SConscript'])
|