Win64: Bugfix for non working scons, thanks to matd for the fix!
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 22 Feb 2010 22:56:28 +0000 (22:56 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 22 Feb 2010 22:56:28 +0000 (22:56 +0000)
jesterKing: please check if the win32 dll's aren't needed anymore. Seems that they are compiled into ffmpeg, right?

SConstruct
config/win64-vc-config.py

index 6c404784ab0842362ebdc8d290b883700887fcc4..7e432bf7dfae1442d45caf58d47570f13e001dc4 100644 (file)
@@ -611,18 +611,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
                                        '${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)
index 9ba52d4c7749f606c791f1984bffbc384020c698..41772dea14b5c6de76e0f363be0a6d196ed64b9f 100644 (file)
@@ -2,11 +2,11 @@ LCGDIR = '#../lib/win64'
 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'