diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-11-20 14:15:35 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-11-20 14:15:35 +0300 |
| commit | af0d38d6eff1f165e88bc753b8b9c99b9f5a9fc9 (patch) | |
| tree | e765337897b43066344585beb3de0d71692f67a0 | |
| parent | 19a4f411723a08cded485cf694bbbab4a3dba31c (diff) | |
Patch [ #5254 ] FFMpeg for scons for MSVC
from Guillaume Lecocq
I also added -D_CRT_SECURE_NO_DEPRECATE to shut the newer msvc version about deprecated functions (sprintf et al).
| -rw-r--r-- | SConstruct | 15 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 9 |
2 files changed, 23 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index b5fb4d7d4ac..cc10be55f2b 100644 --- a/SConstruct +++ b/SConstruct @@ -370,6 +370,21 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll'] if env['WITH_BF_ICONV']: dllsources += ['${LCGDIR}/iconv/lib/iconv.dll'] + if env['WITH_BF_FFMPEG']: + dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll', + '${LCGDIR}/ffmpeg/lib/avformat-51.dll', + '${LCGDIR}/ffmpeg/lib/avutil-49.dll', + '${LCGDIR}/ffmpeg/lib/libdts.dll', + '${LCGDIR}/ffmpeg/lib/libfaac.dll', + '${LCGDIR}/ffmpeg/lib/libfaad.dll', + '${LCGDIR}/ffmpeg/lib/libgsm.dll', + '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll', + '${LCGDIR}/ffmpeg/lib/libogg-0.dll', + '${LCGDIR}/ffmpeg/lib/libvorbis-0.dll', + '${LCGDIR}/ffmpeg/lib/libvorbisenc-2.dll', + '${LCGDIR}/ffmpeg/lib/libx264-54.dll', + '${LCGDIR}/ffmpeg/lib/postproc-51.dll', + '${LCGDIR}/ffmpeg/lib/xvidcore.dll'] windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) allinstall += windlls diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 5ce6745e85c..cccd7f24009 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -4,6 +4,13 @@ LIBDIR = '${LCGDIR}' WITH_BF_VERSE = 'false' BF_VERSE_INCLUDE = "#extern/verse/dist" +# enable ffmpeg support +WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG +BF_FFMPEG = LIBDIR +'/ffmpeg' +BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' +BF_FFMPEG_LIB = 'avformat-51.lib avcodec-51.lib avutil-49.lib postproc-51.lib' + BF_PYTHON = LIBDIR + '/python' BF_PYTHON_VERSION = '2.4' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' @@ -140,7 +147,7 @@ CCFLAGS = ['/nologo', '/Og', '/Ot', '/Ob1', '/Op', '/G6','/EHsc', '/J', '/W3', ' BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET.base}.sbr'] -CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DUSE_OPENAL', '-DFTGL_LIBRARY_STATIC'] +CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DUSE_OPENAL', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE'] REL_CFLAGS = ['-O2', '-DNDEBUG'] REL_CCFLAGS = ['-O2', '-DNDEBUG'] C_WARN = [] |