Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-05-14 17:31:38 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-05-14 17:31:38 +0400
commita7a79322bfacd5bbbf7f931143275557ea061c83 (patch)
tree1312203c7c9cefda6284a77fa3b403aafc3ddb29 /extern/bullet2/readme.txt
parente0e97dfca70c475069ab207c24bffc4da1fa7701 (diff)
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.
Diffstat (limited to 'extern/bullet2/readme.txt')
-rw-r--r--extern/bullet2/readme.txt4
1 files changed, 4 insertions, 0 deletions
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