diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-06-09 00:12:29 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-06-09 00:12:29 +0400 |
| commit | 07001e708ed59e69871e8b4b096106981d9e6cd7 (patch) | |
| tree | 45a035b9d981af9c6e953e85977a3c30a3ec5a29 /config | |
| parent | 062fb01614be23623fc9ebedc1ca1307ceb9a1bf (diff) | |
| parent | 71573cbd55a9088f4f3011da473ad6101fc2b531 (diff) | |
soc-2008-mxcurioni: merged changes to revision 15163
Diffstat (limited to 'config')
| -rw-r--r-- | config/linux2-config.py | 18 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py index 965b5935886..4ee5aabfbd3 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -139,6 +139,24 @@ BF_FFMPEG_LIB = '' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' +WITH_BF_OPENJPEG = 'true' +BF_OPENJPEG = '#extern/libopenjpeg' +BF_OPENJPEG_LIB = '' +# Uncomment the following two lines to use system's ffmpeg +# BF_FFMPEG = '/usr' +# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' +BF_OPENJPEG_INC = '${BF_OPENJPEG}/include' +BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' + +WITH_BF_REDCODE = 'true' +BF_REDCODE = '#extern/libredcode' +BF_REDCODE_LIB = '' +# Uncomment the following two lines to use system's ffmpeg +# BF_FFMPEG = '/usr' +# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil' +BF_REDCODE_INC = '${BF_REDCODE}/include' +BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' + # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'false' BF_OPENGL = '/usr' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 8eace13c807..5a637d18996 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -166,7 +166,7 @@ REL_CCFLAGS = ['-O2', '-DNDEBUG'] C_WARN = [] CC_WARN = [] -LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid' +LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid' PLATFORM_LINKFLAGS = ''' /SUBSYSTEM:CONSOLE |