diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2010-02-22 19:34:27 +0300 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2010-02-22 19:34:27 +0300 |
| commit | 77779575211d9f6f99cebd2273e6879a78c642fc (patch) | |
| tree | 20f5abf09925bdefbc97a32665481fdcdd3238b5 | |
| parent | 960e45c42d7afdf48c3ea858e5922653ce10071e (diff) | |
OSX buildscripts update following ffmpeg precompiled libs update
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config/darwin-config.py | 3 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c7bfce682f0..704e7be7b3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -508,7 +508,7 @@ IF(APPLE) 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 @@ IF(APPLE) 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) diff --git a/config/darwin-config.py b/config/darwin-config.py index cd4d7ee88e9..b0e6948001b 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -82,7 +82,8 @@ WITH_BF_FFMPEG = True # -DWITH_FFMPEG 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' diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 7727e2352a1..a3748ae247f 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -109,7 +109,7 @@ ifndef CONFIG_GUESS 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 |