diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2010-04-03 13:54:38 +0400 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2010-04-03 13:54:38 +0400 |
| commit | 939a83e3475d95fe95713e691d275abef6753d40 (patch) | |
| tree | fb09f0ff76d44f6b874c3746656b51b727af669c | |
| parent | c1e55a75b8c2808e418257720643397357beca22 (diff) | |
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
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config/darwin-config.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b690cdd81a..ba344a0a434 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -460,8 +460,8 @@ IF(APPLE) 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) diff --git a/config/darwin-config.py b/config/darwin-config.py index b0e6948001b..bac4c9ab165 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -131,8 +131,8 @@ BF_JACK_LIBPATH = '${BF_JACK}/lib' 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) |