diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-24 06:51:59 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-24 06:51:59 +0400 |
| commit | 365783cad4e4b6c2e7d554e71d3ebac4b3d1922c (patch) | |
| tree | 83dbf5b55dfc886e98bdc29b7f62d353af107016 /config | |
| parent | ac44d73acdb5297d3e0a177b00a03ef8cca5e696 (diff) | |
| parent | 5e9e6df2a24b28cbb8c1de293725ebe4af3f9a2d (diff) | |
* merge r22734 from trunk
NOTE: Remember to svn up your lib/windows. Also, CMake files might need updating still
Diffstat (limited to 'config')
| -rw-r--r-- | config/win32-mingw-config.py | 6 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index a7de3f6111e..cde41d6ffba 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -22,9 +22,9 @@ BF_OPENAL_LIB = 'wrap_oal' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_FFMPEG = False -BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264' -BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib' -BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include' +BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0' +BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib' +BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include' BF_LIBSAMPLERATE = LIBDIR + '/samplerate' BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index e9bbd42e915..2c219633540 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -4,7 +4,7 @@ LIBDIR = '${LCGDIR}' # enable ffmpeg support WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = LIBDIR +'/ffmpeg' -BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib' |