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-01-12 19:56:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-01-12 19:56:08 +0400
commit8b59efe129748f6043bc2bb0605d977fea9b7183 (patch)
treee57a414b2cf5ed664dc700dd54e91ac2cdb205d0 /CMakeLists.txt
parentaffb38fd597aad1ecc8dbeb09eadb38f0213d6b8 (diff)
../lib/linux wont built with theoraenc theoradec unbuntu user also complained that this failed to link.
Im not sure whats best default here, removing for now. if it gives more problems we could have a FindTheora module.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa362f7440d..0fa6ed26bc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -461,7 +461,8 @@ if(UNIX AND NOT APPLE)
# use lib dir if available and nothing else specified
if(LIBDIR AND NOT FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
- set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
+ # XXX, some distros might need 'theoraenc theoradec' too
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
else()
set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")