[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27088] trunk/blender: OSX buildscripts update following ffmpeg precompiled libs update

[Damien Plisson]

Revision: 27088
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27088
Author:   damien78
Date:     2010-02-22 17:34:27 +0100 (Mon, 22 Feb 2010)

Log Message:
-----------
OSX buildscripts update following ffmpeg precompiled libs update

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/config/darwin-config.py
    trunk/blender/source/nan_definitions.mk

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt        2010-02-22 16:31:17 UTC (rev 27087)
+++ trunk/blender/CMakeLists.txt        2010-02-22 16:34:27 UTC (rev 27088)
@@ -508,7 +508,7 @@
 
        SET(ZLIB /usr)
        SET(ZLIB_INC "${ZLIB}/include")
-       SET(ZLIB_LIBRARIES z)
+       SET(ZLIB_LIBRARIES z bz2)
 
        SET(FREETYPE ${LIBDIR}/freetype)
        SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include 
${FREETYPE}/include/freetype2)
@@ -522,7 +522,7 @@
 
        SET(FFMPEG ${LIBDIR}/ffmpeg)
        SET(FFMPEG_INC ${FFMPEG}/include)
-       SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 
xvidcore)
+       SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 
xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
        SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
        SET(LIBSAMPLERATE ${LIBDIR}/samplerate)

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py       2010-02-22 16:31:17 UTC (rev 
27087)
+++ trunk/blender/config/darwin-config.py       2010-02-22 16:34:27 UTC (rev 
27088)
@@ -82,7 +82,8 @@
 BF_FFMPEG = LIBDIR + '/ffmpeg'
 BF_FFMPEG_INC = "${BF_FFMPEG}/include"
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 
xvidcore'
+BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 
xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
+#bz2 is a standard osx dynlib
 
 # python 3.1 uses precompiled libraries in bf svn /lib by default
 BF_PYTHON_VERSION = '3.1'

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk     2010-02-22 16:31:17 UTC (rev 
27087)
+++ trunk/blender/source/nan_definitions.mk     2010-02-22 16:34:27 UTC (rev 
27088)
@@ -109,7 +109,7 @@
     else
       export NAN_FFMPEG ?= $(LCGDIR)/ffmpeg
       ifeq ($(OS), darwin)
-        export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a 
$(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libswscale.a 
$(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavdevice.a 
$(NAN_FFMPEG)/lib/libmp3lame.a $(NAN_FFMPEG)/lib/libx264.a 
$(NAN_FFMPEG)/lib/libxvidcore.a
+        export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a 
$(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libswscale.a 
$(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavdevice.a 
$(NAN_FFMPEG)/lib/libmp3lame.a $(NAN_FFMPEG)/lib/libx264.a 
$(NAN_FFMPEG)/lib/libxvidcore.a $(NAN_FFMPEG)/lib/libtheora.a 
$(NAN_FFMPEG)/lib/libtheoradec.a $(NAN_FFMPEG)/lib/libtheoraenc.a 
$(NAN_FFMPEG)/lib/libvorbis.a $(NAN_FFMPEG)/lib/libvorbisenc.a 
$(NAN_FFMPEG)/lib/libvorbisfile.a $(NAN_FFMPEG)/lib/libogg.a -lbz2
       else
         export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a 
$(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libswscale.a 
$(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavdevice.a
       endif


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs