griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merging r39631 through r39633 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin
2011-08-22 19:34:10 +00:00
parent ffaa5d0210 0e3b8ff6a5
commit d5ebeb7e7c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/scons/config/linuxcross-config.py
View File

@@ -130,6 +130,7 @@ 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'

7
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
View File

@@ -49,7 +49,12 @@ if(WITH_BUILDINFO)
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)