From 5e9e6df2a24b28cbb8c1de293725ebe4af3f9a2d Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Mon, 24 Aug 2009 02:49:57 +0000
Subject: * changes to work with updated FFMPEG libs. Mainly build system.
 CMake files may need changing too.

NOTE: remember to svn up in lib/windows!
---
 config/win32-mingw-config.py | 8 ++++----
 config/win32-vc-config.py    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 5801df86c27..f7130cb4ac3 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -26,10 +26,10 @@ BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 # Warning, this static lib configuration is untested! users of this OS please confirm.
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 
-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'
+WITH_BF_FFMPEG = True
+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'
 
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 359f52e6bf8..3ec76d464bc 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -7,7 +7,7 @@ BF_VERSE_INCLUDE = "#extern/verse/dist"
 # 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'
 
-- 
cgit v1.2.3