diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
| commit | cc3adc2202ce0208b1c95bc3fe3f0290b3b511f9 (patch) | |
| tree | 503d6bc4376b27a6efe73739609e9bbb1f1188cb /source/blender/python/intern/CMakeLists.txt | |
| parent | 0896a227232f741b6028219a208ae60e78515406 (diff) | |
| parent | b5595298d36a5023cc33ed41463fd6c032f2ec7b (diff) | |
Merged changes in the trunk up to revision 43038.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/python/intern/CMakeLists.txt')
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 73b2285ca13..76fe439027f 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -33,7 +33,7 @@ set(INC ../../makesdna ../../makesrna ../../windowmanager - ../../gpu + ../../gpu ../../freestyle/intern/python ../../../../intern/guardedalloc ) @@ -43,9 +43,10 @@ set(INC_SYS ) set(SRC - gpu.c + gpu.c bpy.c bpy_app.c + bpy_app_ffmpeg.c bpy_app_handlers.c bpy_driver.c bpy_interface.c @@ -63,9 +64,10 @@ set(SRC bpy_util.c stubs.c - gpu.h + gpu.h bpy.h bpy_app.h + bpy_app_ffmpeg.h bpy_app_handlers.h bpy_driver.h bpy_intern_string.h @@ -102,7 +104,15 @@ if(WITH_CYCLES) endif() if(WITH_INTERNATIONAL) - add_definitions(-DWITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + +if(WITH_CODEC_FFMPEG) + list(APPEND INC_SYS + ${FFMPEG_INCLUDE_DIRS} + ) + + add_definitions(-DWITH_FFMPEG) endif() blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}") |