diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-03 14:50:21 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-03 14:50:21 +0400 |
| commit | 2c4357c1e10df65089459e048c44ff9c99b8ffd9 (patch) | |
| tree | 4553542bc9fe1953aac37d486d9d3b365971a41f /SConstruct | |
| parent | 461bb17d31cc17c07a4b00437b5b90d58f14a894 (diff) | |
- Move list of FFmpeg DLLs to be installed from SConstruct
to conficuration variable BF_FFMPEG_DDL.
This would allow to use different FFmpeg in buildbot.
- Added some 3DMOUSE variables to list of command line options.
Now 3dmouse related-settings can be set from command line.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index dbeabb5c2ef..529f6daeef1 100644 --- a/SConstruct +++ b/SConstruct @@ -664,11 +664,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll') if env['WITH_BF_FFMPEG']: - dllsources += ['${BF_FFMPEG_LIBPATH}/avcodec-52.dll', - '${BF_FFMPEG_LIBPATH}/avformat-52.dll', - '${BF_FFMPEG_LIBPATH}/avdevice-52.dll', - '${BF_FFMPEG_LIBPATH}/avutil-50.dll', - '${BF_FFMPEG_LIBPATH}/swscale-0.dll'] + dllsources += env['BF_FFMPEG_DLL'].split() # Since the thumb handler is loaded by Explorer, architecture is # strict: the x86 build fails on x64 Windows. We need to ship |