diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
| commit | feccbaabbd39c18b2f552964ebd8dfab4eeaed89 (patch) | |
| tree | 0069f654883a7a02dd320649ce61bd7933748111 /source/blender/python/SConscript | |
| parent | a22096e8019c461128a0907e4026859996ec1b5c (diff) | |
| parent | 37ba969c74840142682cf22f34610f3b65b86cf4 (diff) | |
Merged changes in the trunk up to revision 53584.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h
Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
Diffstat (limited to 'source/blender/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 15403d7acf4..4fb6d771c5b 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -134,6 +134,12 @@ if env['WITH_BF_TIFF']: if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') +if env['WITH_BF_OPENAL']: + defs.append('WITH_OPENAL') + +if env['WITH_BF_SDL']: + defs.append('WITH_SDL') + if env['WITH_BF_JACK']: defs.append('WITH_JACK') @@ -155,12 +161,12 @@ if env['WITH_BF_REMESH']: if env['WITH_BF_SMOKE']: defs.append('WITH_SMOKE') -if env['WITH_BF_OPENAL']: - defs.append('WITH_OPENAL') - if env['WITH_BF_COLLADA']: defs.append('WITH_COLLADA') +if env['WITH_BF_OIIO']: + defs.append('WITH_OCIO') + if env['WITH_BF_PLAYER']: defs.append('WITH_PLAYER') |