* merge r22734 from trunk
authorNathan Letwory <nathan@letworyinteractive.com>
Mon, 24 Aug 2009 02:51:59 +0000 (02:51 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Mon, 24 Aug 2009 02:51:59 +0000 (02:51 +0000)
NOTE: Remember to svn up your lib/windows. Also, CMake files might need updating still

1  2 
SConstruct
config/win32-mingw-config.py
config/win32-vc-config.py

diff --cc SConstruct
@@@ -580,14 -570,12 +580,14 @@@ if env['OURPLATFORM'] in ('win32-vc', '
                                                '${LCGDIR}/ffmpeg/lib/avformat-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avutil-50.dll',
                                              '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
                                              '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
                                              '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
                                              '${LCGDIR}/ffmpeg/lib/libx264-67.dll',
                                              '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
#                                             '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
#                                             '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
#                                             '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
#                                             '${LCGDIR}/ffmpeg/lib/libx264-67.dll',
#                                             '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
                                                '${LCGDIR}/ffmpeg/lib/swscale-0.dll']
 +      if env['WITH_BF_JACK']:
 +              dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
        windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
        allinstall += windlls
  
@@@ -20,23 -23,14 +20,23 @@@ BF_OPENAL = LIBDIR + '/openal
  BF_OPENAL_INC = '${BF_OPENAL}/include'
  BF_OPENAL_LIB = 'wrap_oal'
  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 = True
 +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'
 +BF_LIBSAMPLERATE_LIB = 'libsamplerate'
 +BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
 +
 +WITH_BF_JACK = False
 +BF_JACK = LIBDIR + '/jack'
 +BF_JACK_INC = '${BF_JACK}/include'
 +BF_JACK_LIB = 'libjack'
 +BF_JACK_LIBPATH = '${BF_JACK}/lib'
 +
  WITH_BF_SDL = True
  BF_SDL = LIBDIR + '/sdl'
  BF_SDL_INC = '${BF_SDL}/include'
Simple merge