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/intern/CMakeLists.txt | |
| 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/intern/CMakeLists.txt')
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 8f90a823668..823c7c709d7 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -56,6 +56,7 @@ set(SRC bpy_library.c bpy_operator.c bpy_operator_wrap.c + bpy_path.c bpy_props.c bpy_rna.c bpy_rna_anim.c @@ -76,6 +77,7 @@ set(SRC bpy_library.h bpy_operator.h bpy_operator_wrap.h + bpy_path.h bpy_props.h bpy_rna.h bpy_rna_anim.h @@ -190,12 +192,16 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -if(WITH_JACK) - add_definitions(-DWITH_JACK) +if(WITH_OPENAL) + add_definitions(-DWITH_OPENAL) endif() -if(WITH_LIBMV) - add_definitions(-DWITH_LIBMV) +if(WITH_SDL) + add_definitions(-DWITH_SDL) +endif() + +if(WITH_JACK) + add_definitions(-DWITH_JACK) endif() if(WITH_LIBMV) @@ -222,14 +228,14 @@ if(WITH_MOD_SMOKE) add_definitions(-DWITH_SMOKE) endif() -if(WITH_OPENAL) - add_definitions(-DWITH_OPENAL) -endif() - if(WITH_OPENCOLLADA) add_definitions(-DWITH_COLLADA) endif() +if(WITH_OPENCOLORIO) + add_definitions(-DWITH_OCIO) +endif() + if(WITH_PLAYER) add_definitions(-DWITH_PLAYER) endif() |