Update rules for linux cross and mingw: list of DLLs for FFmpeg should be defined...
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 22 Aug 2011 19:27:54 +0000 (19:27 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 22 Aug 2011 19:27:54 +0000 (19:27 +0000)
build_files/scons/config/linuxcross-config.py
build_files/scons/config/win32-mingw-config.py

index 563b1ad980c53ee7024ad1df697b80f582ae1e68..1bdf735f4581d8276c5a2554b7b2593b04ca6643 100644 (file)
@@ -129,6 +129,7 @@ BF_FFMPEG = LIBDIR + '/ffmpeg'
 BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 WITH_BF_OPENJPEG = True
 BF_OPENJPEG = '#extern/libopenjpeg'
index b29c4845a9c6a37864f56182046e730735b4cd84..c815b76ef73ff4412080bb5ef5aa2c0675e99a0b 100644 (file)
@@ -21,6 +21,7 @@ WITH_BF_FFMPEG = False
 BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
 BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
 BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'