diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-25 12:20:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-25 12:20:19 +0400 |
| commit | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (patch) | |
| tree | b3fdb366cb49bdea5b57dfa6ba4a82635c68d0ee /source/blender/blenkernel/CMakeLists.txt | |
| parent | a2ebfc82dbe954acc432ae017ac62a30a11b6a16 (diff) | |
| parent | e99a23fc6b33b5097eab44aac19c2a089ddebce6 (diff) | |
Merged changes in the trunk up to revision 45133.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 86035e218c5..80888e9b348 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -146,7 +146,6 @@ set(SRC intern/unit.c intern/world.c intern/writeavi.c - intern/writeffmpeg.c intern/writeframeserver.c BKE_DerivedMesh.h @@ -233,7 +232,6 @@ set(SRC BKE_utildefines.h BKE_world.h BKE_writeavi.h - BKE_writeffmpeg.h BKE_writeframeserver.h depsgraph_private.h nla_private.h @@ -302,6 +300,10 @@ if(WITH_CODEC_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) + list(APPEND SRC + intern/writeffmpeg.c + BKE_writeffmpeg.h + ) list(APPEND INC ../../../intern/ffmpeg ) @@ -389,6 +391,10 @@ if(WITH_FFTW3) add_definitions(-DFFTW3=1) endif() +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + ## Warnings as errors, this is too strict! #if(MSVC) # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") |