[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27095] trunk/blender: Win64: Bugfix for non working scons, thanks to matd for the fix!

[Daniel Genrich]

Revision: 27095
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27095
Author:   genscher
Date:     2010-02-22 23:56:28 +0100 (Mon, 22 Feb 2010)

Log Message:
-----------
Win64: Bugfix for non working scons, thanks to matd for the fix!
jesterKing: please check if the win32 dll's aren't needed anymore. Seems that they are compiled into ffmpeg, right?

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/config/win64-vc-config.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-02-22 22:17:14 UTC (rev 27094)
+++ trunk/blender/SConstruct	2010-02-22 22:56:28 UTC (rev 27095)
@@ -611,18 +611,6 @@
 					'${BF_FFMPEG_LIBPATH}/avutil-50.dll',
 					'${BF_FFMPEG_LIBPATH}/swscale-0.dll']
 
-		if env['OURPLATFORM'] != 'linuxcross':
-			#
-			# TODO: Does it mean we haven't got support of this codecs if
-			#       we're using cross-compilation?
-			#       Or in case of native compilation this libraries are
-			#       unneccessary to?
-			#
-			dllsources += ['${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
-							'${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
-							'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-							'${LCGDIR}/ffmpeg/lib/libx264-67.dll']
-
 	if env['WITH_BF_JACK']:
 		dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
 	windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)

Modified: trunk/blender/config/win64-vc-config.py
===================================================================
--- trunk/blender/config/win64-vc-config.py	2010-02-22 22:17:14 UTC (rev 27094)
+++ trunk/blender/config/win64-vc-config.py	2010-02-22 22:56:28 UTC (rev 27095)
@@ -2,11 +2,11 @@
 LIBDIR = '${LCGDIR}'
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = False # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
+BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '3.1'