diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2010-02-23 01:56:28 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2010-02-23 01:56:28 +0300 |
| commit | 8a31fab3041d4c9804fdce036dc70637f4993507 (patch) | |
| tree | 727ee36f18b98b737830d01fd9d327a3e36f9ac2 | |
| parent | a7d606a2ff2b696fb61e20b96320d7ed4513f688 (diff) | |
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?
| -rw-r--r-- | SConstruct | 12 | ||||
| -rw-r--r-- | config/win64-vc-config.py | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/SConstruct b/SConstruct index 6c404784ab0..7e432bf7dfa 100644 --- a/SConstruct +++ b/SConstruct @@ -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) diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 9ba52d4c774..41772dea14b 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -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' |