Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-21 02:00:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-21 02:00:21 +0400
commit11500a359024470396d7b0b32f5fd00d101e5804 (patch)
treec8dc76578a846ee7b89b95b77f030313a19791d3 /source/blender/blenkernel/CMakeLists.txt
parent7dda8182ad65ae1d7507ae33e198d2031666f8e7 (diff)
patch from Richard Shaw, exclude ffmpeg files when its disabled.
also fix for incorrect text in mesh specials menu - Select Inverse was called (De)Select All.
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
-rw-r--r--source/blender/blenkernel/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index ce282e90ac1..fe06ba1ad2c 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -144,7 +144,6 @@ set(SRC
intern/unit.c
intern/world.c
intern/writeavi.c
- intern/writeffmpeg.c
intern/writeframeserver.c
BKE_DerivedMesh.h
@@ -230,7 +229,6 @@ set(SRC
BKE_utildefines.h
BKE_world.h
BKE_writeavi.h
- BKE_writeffmpeg.h
BKE_writeframeserver.h
depsgraph_private.h
nla_private.h
@@ -299,6 +297,10 @@ if(WITH_CODEC_QUICKTIME)
endif()
if(WITH_CODEC_FFMPEG)
+ list(APPEND SRC
+ intern/writeffmpeg.c
+ BKE_writeffmpeg.h
+ )
list(APPEND INC
../../../intern/ffmpeg
)