From a7a79322bfacd5bbbf7f931143275557ea061c83 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 14 May 2012 13:31:38 +0000 Subject: Make blender compilable by gcc-4.7 and strict compilation flags: - Remove strict flags from files, which are using FFmpeg stuff We're still using some symbols which are marked as deprecated. Ideally, we shall switch to new API, but it's a bit larger challenge because we don't want to break compatibility withotu actual need. - Replace MAKE_ID with BT_MAKE_ID in bullet library. This is needed to prevent re-definition of MAKE_ID in bullet library. Seems it's only used to read blender files, so should be quite safe change. --- extern/bullet2/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'extern/bullet2/readme.txt') diff --git a/extern/bullet2/readme.txt b/extern/bullet2/readme.txt index 02430cb5c0e..e2546b049e3 100644 --- a/extern/bullet2/readme.txt +++ b/extern/bullet2/readme.txt @@ -15,3 +15,7 @@ Once that is done all build systems can be updated to use/build extern/bullet2 f Questions? mail blender at erwincoumans.com, or check the bf-blender mailing list. Thanks, Erwin + +Apply patches/make_id.patch to prevent duplicated define of MAKE_ID macro in blender +side and bullet side. +Sergey -- cgit v1.2.3