From c33e0c053ad3f842d1f07454e42e045f5f4fec1c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 22 Aug 2011 19:13:26 +0000 Subject: [PATCH 1/2] fix for buildinfo changes with blenderplayer --- source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index f852d061cf7..0610cf2fdbe 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -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) From 0e3b8ff6a5fe0d926b34612f75281deff0e63f0d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 22 Aug 2011 19:27:54 +0000 Subject: [PATCH 2/2] Update rules for linux cross and mingw: list of DLLs for FFmpeg should be defined there. --- build_files/scons/config/linuxcross-config.py | 1 + build_files/scons/config/win32-mingw-config.py | 1 + 2 files changed, 2 insertions(+) diff --git a/build_files/scons/config/linuxcross-config.py b/build_files/scons/config/linuxcross-config.py index 563b1ad980c..1bdf735f458 100644 --- a/build_files/scons/config/linuxcross-config.py +++ b/build_files/scons/config/linuxcross-config.py @@ -129,6 +129,7 @@ BF_FFMPEG = LIBDIR + '/ffmpeg' BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2' 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' diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index b29c4845a9c..c815b76ef73 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -21,6 +21,7 @@ WITH_BF_FFMPEG = False BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2' BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib' BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include' +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_LIBSAMPLERATE = LIBDIR + '/samplerate' BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'