2.5: Render

[blender-staging.git] / source / blender / makesrna / intern / SConscript

diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 03f0afdb2ccc2c341c2a96371b391fa8eebe9dad..7cd3fde21be3bf545989fa46fb0b4930838dcd0a 100644 (file)
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -29,6 +29,10 @@ makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\"" '
 
 defs = []
 
+incs = '#/intern/guardedalloc ../../blenlib ../../blenkernel'
+incs += ' ../../imbuf ../../makesdna ../../makesrna'
+incs += ' ../../windowmanager ../../editors/include'
+
 if env['WITH_BF_OPENEXR']:
        defs.append('WITH_OPENEXR')
 
@@ -40,6 +44,10 @@ if env['WITH_BF_DDS']:
 
 if env['WITH_BF_FFMPEG']:
        defs.append('WITH_FFMPEG')
+       incs += ' ' + env['BF_FFMPEG_INC']
+
+if env['WITH_BF_OGG']:
+       defs.append('WITH_OGG')
 
 if env['WITH_BF_QUICKTIME']:
        defs.append('WITH_QUICKTIME')
@@ -49,14 +57,7 @@ if env['WITH_BF_LCMS']:
 
 makesrna_tool.Append(CPPDEFINES=defs)
 
-makesrna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
-                                                                '../../blenlib',
-                                                                '../../blenkernel',
-                                                                '../../imbuf',
-                                                                '../../makesdna',
-                                                                '../../makesrna',
-                                                                '../../windowmanager',
-                                                                '../../editors/include'])
+makesrna_tool.Append (CPPPATH = Split(incs))
 
 if env['OURPLATFORM'] == 'linuxcross':
        USE_WINE = True # when cross compiling on linux 64bit this is useful