[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43323] trunk/blender/CMakeLists.txt: ../ lib/ linux wont built with theoraenc theoradec unbuntu user also complained that this failed to link .

Campbell Barton ideasman42 at gmail.com
Thu Jan 12 16:56:09 CET 2012


Revision: 43323
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43323
Author:   campbellbarton
Date:     2012-01-12 15:56:08 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
../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.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-01-12 15:44:18 UTC (rev 43322)
+++ trunk/blender/CMakeLists.txt	2012-01-12 15:56:08 UTC (rev 43323)
@@ -461,7 +461,8 @@
 		# 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")




More information about the Bf-blender-cvs mailing list