synched branch with trunk at revision 29109

This commit is contained in:
Nick Samarin
2010-05-31 23:44:43 +00:00
parent 05b92f0fc9
commit d3d2e92fcc
210 changed files with 10935 additions and 8773 deletions

View File

@@ -23,6 +23,9 @@ if env['WITH_BF_BINRELOC']:
if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR')
if env['WITH_BF_TIFF']:
defs.append('WITH_TIFF')
if not env['WITH_BF_SDL']:
defs.append('DISABLE_SDL')