diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
commit | 87627374000b7de7445736a7239a3f2b168ce7eb (patch) | |
tree | 2f0fe5d42d0938fc1b684af702d8613099bea1bd /config/irix6-config.py | |
parent | 784d8ee37a52f3ef689aa6d02e75e50566efe93f (diff) | |
parent | ba8ea9ec63c25b1ce134a846176f7bf252f4d487 (diff) |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD
Diffstat (limited to 'config/irix6-config.py')
-rw-r--r-- | config/irix6-config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/irix6-config.py b/config/irix6-config.py index eb6c46b38de..cb66dbafcce 100644 --- a/config/irix6-config.py +++ b/config/irix6-config.py @@ -142,7 +142,7 @@ WITH_BF_BINRELOC = 'false' WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG # Uncomment the following two lines to use system's ffmpeg BF_FFMPEG = LCGDIR+'/ffmpeg' -BF_FFMPEG_LIB = 'avformat avcodec swscale avutil faad faac vorbis x264 ogg mp3lame z' +BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice faad faac vorbis x264 ogg mp3lame z' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' @@ -155,7 +155,7 @@ BF_OGG_LIB = 'ogg vorbis theoraenc theoradec' WITH_BF_OPENJPEG = 'false' BF_OPENJPEG = '#extern/libopenjpeg' BF_OPENJPEG_LIB = '' -BF_OPENJPEG_INC = '${BF_OPENJPEG}/include' +BF_OPENJPEG_INC = '${BF_OPENJPEG}' BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' WITH_BF_REDCODE = 'false' |