[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27971] trunk/blender: OSX: CMake & scons update for Ogg/Vorbis/FLAC added support to lib SNDFILE

[Damien Plisson]

Revision: 27971
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27971
Author:   damien78
Date:     2010-04-03 11:54:38 +0200 (Sat, 03 Apr 2010)

Log Message:
-----------
OSX: CMake & scons update for Ogg/Vorbis/FLAC added support to lib SNDFILE

Note that you need to svn up the precompiled lib folder (darwin-*) too to be able to build with SNDFILE

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-04-03 09:50:02 UTC (rev 27970)
+++ trunk/blender/CMakeLists.txt	2010-04-03 09:54:38 UTC (rev 27971)
@@ -460,8 +460,8 @@
 	IF(WITH_SNDFILE)
 		SET(SNDFILE ${LIBDIR}/sndfile)
 		SET(SNDFILE_INC ${SNDFILE}/include)
-		SET(SNDFILE_LIB sndfile)
-		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+		SET(SNDFILE_LIB sndfile FLAC ogg vorbis vorbisenc)
+		SET(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib)
 	ENDIF(WITH_SNDFILE)
 
 	SET(PYTHON_VERSION 3.1)

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py	2010-04-03 09:50:02 UTC (rev 27970)
+++ trunk/blender/config/darwin-config.py	2010-04-03 09:54:38 UTC (rev 27971)
@@ -131,8 +131,8 @@
 WITH_BF_SNDFILE = True
 BF_SNDFILE = LIBDIR + '/sndfile'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+BF_SNDFILE_LIB = 'sndfile FLAC ogg vorbis vorbisenc'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib ${BF_FFMPEG}/lib' #ogg libs are stored in ffmpeg dir
 
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)