Merging r39631 through r39633 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 22 Aug 2011 19:34:10 +0000 (19:34 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 22 Aug 2011 19:34:10 +0000 (19:34 +0000)
1  2 
build_files/scons/config/linuxcross-config.py

index 94a331042119c6babbed647c0b471a05bfbefb83,1bdf735f4581d8276c5a2554b7b2593b04ca6643..8057d478c31acf9f9c26ee8f64c299afd33ad599
@@@ -127,9 -127,9 +127,10 @@@ WITH_BF_BINRELOC = Fals
  WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
  BF_FFMPEG = LIBDIR + '/ffmpeg'
  BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
 +BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
  BF_FFMPEG_INC = '${BF_FFMPEG}/include'
  BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
+ BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
  
  WITH_BF_OPENJPEG = True
  BF_OPENJPEG = '#extern/libopenjpeg'