[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39163] branches/soc-2011-salad/ build_files/scons/config: Having duplicated BF_FFMPEG_DLL for windows scons wasn't good idea.

[Sergey Sharybin]

Revision: 39163
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39163
Author:   nazgul
Date:     2011-08-07 18:49:01 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Having duplicated BF_FFMPEG_DLL for windows scons wasn't good idea.
Use dlls for ffmpeg-0.8.

Modified Paths:
--------------
    branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py

Modified: branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py 
2011-08-07 18:15:40 UTC (rev 39162)
+++ branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py 
2011-08-07 18:49:01 UTC (rev 39163)
@@ -8,7 +8,6 @@
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib 
swscale-2.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'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll 
${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll 
${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll'
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '3.2'

Modified: branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py 
2011-08-07 18:15:40 UTC (rev 39162)
+++ branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py 
2011-08-07 18:49:01 UTC (rev 39163)
@@ -8,7 +8,6 @@
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib 
swscale-2.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'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll 
${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll 
${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll'
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '3.2'

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs