[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39634] branches/soc-2011-tomato: Merging r39631 through r39633 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 39634
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39634
Author:   nazgul
Date:     2011-08-22 19:34:10 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
Merging r39631 through r39633 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39631
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39633

Modified Paths:
--------------
    branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36831-39630
   + /trunk/blender:36831-39633

Modified: branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py	2011-08-22 19:30:05 UTC (rev 39633)
+++ branches/soc-2011-tomato/build_files/scons/config/linuxcross-config.py	2011-08-22 19:34:10 UTC (rev 39634)
@@ -130,6 +130,7 @@
 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'


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-39630
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-39633

Modified: branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt	2011-08-22 19:30:05 UTC (rev 39633)
+++ branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt	2011-08-22 19:34:10 UTC (rev 39634)
@@ -49,7 +49,12 @@
 	list(APPEND SRC
 		../../creator/buildinfo.c
 	)
-	add_definitions(-DBUILD_DATE)
+	add_definitions(-DBUILD_DATE="\"\""
+					-DBUILD_TIME="\"\""
+					-DBUILD_REV="\"\""
+					-DBUILD_PLATFORM="\"\""
+					-DBUILD_TYPE="\"\""
+					)
 endif()
 
 if(WITH_GAMEENGINE)