diff options
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index dc327abd3ad..5ea42ee65ae 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -14,12 +14,16 @@ incs += ' ../gpu #/extern/glew/include' incs += ' #/intern/smoke/extern' incs += ' #/intern/mikktspace' incs += ' #/intern/audaspace/intern' +incs += ' #/intern/ffmpeg' incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_ZLIB_INC'] defs = [ 'GLEW_STATIC' ] +defs.append('WITH_SMOKE') # TODO, make optional +defs.append('WITH_FRAMESERVER') # TODO, make optional + if env['WITH_BF_PYTHON']: incs += ' ../python' incs += ' ' + env['BF_PYTHON_INC'] @@ -78,10 +82,6 @@ if env['OURPLATFORM'] == 'darwin': if env['BF_NO_ELBEEM']: defs.append('DISABLE_ELBEEM') -if env['WITH_BF_LCMS']: - defs.append('WITH_LCMS') - incs += ' ' + env['BF_LCMS_INC'] - if env['WITH_BF_LZO']: incs += ' #/extern/lzo/minilzo' defs.append('WITH_LZO') |