Merged changes in the trunk up to revision 28911.

2010-05-21 22:01:47 +00:00
parent f76c3aa376 c0a0f2c43e
commit dbcb73c033
178 changed files with 7473 additions and 8152 deletions
--- a/source/creator/SConscript
+++ b/source/creator/SConscript
@@ -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')