[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39632] trunk/blender/build_files/scons/ config: Update rules for linux cross and mingw: list of DLLs for FFmpeg should be defined there.

Sergey Sharybin g.ulairi at gmail.com
Mon Aug 22 21:27:54 CEST 2011


Revision: 39632
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39632
Author:   nazgul
Date:     2011-08-22 19:27:54 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
Update rules for linux cross and mingw: list of DLLs for FFmpeg should be defined there.

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/linuxcross-config.py
    trunk/blender/build_files/scons/config/win32-mingw-config.py

Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py	2011-08-22 19:13:26 UTC (rev 39631)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py	2011-08-22 19:27:54 UTC (rev 39632)
@@ -129,6 +129,7 @@
 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'

Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py	2011-08-22 19:13:26 UTC (rev 39631)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py	2011-08-22 19:27:54 UTC (rev 39632)
@@ -21,6 +21,7 @@
 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'




More information about the Bf-blender-cvs mailing list