Revision: 46627
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46627
Author: nazgul
Date: 2012-05-14 13:31:38 +0000 (Mon, 14 May 2012)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/extern/bullet2/readme.txt
trunk/blender/extern/bullet2/src/LinearMath/btSerializer.h
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
Added Paths:
-----------
trunk/blender/extern/bullet2/patches/
trunk/blender/extern/bullet2/patches/make_id.patch
Added: trunk/blender/extern/bullet2/patches/make_id.patch
===================================================================
--- trunk/blender/extern/bullet2/patches/make_id.patch
(rev 0)
+++ trunk/blender/extern/bullet2/patches/make_id.patch 2012-05-14 13:31:38 UTC
(rev 46627)
@@ -0,0 +1,42 @@
+Index: src/LinearMath/btSerializer.h
+===================================================================
+--- src/LinearMath/btSerializer.h (revision 46625)
++++ src/LinearMath/btSerializer.h (working copy)
+@@ -106,23 +106,23 @@
+
+ #define BT_HEADER_LENGTH 12
+ #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined
(__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__)
+-# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
++# define BT_MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d)
)
+ #else
+-# define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
++# define BT_MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a)
)
+ #endif
+
+-#define BT_SOFTBODY_CODE MAKE_ID('S','B','D','Y')
+-#define BT_COLLISIONOBJECT_CODE MAKE_ID('C','O','B','J')
+-#define BT_RIGIDBODY_CODE MAKE_ID('R','B','D','Y')
+-#define BT_CONSTRAINT_CODE MAKE_ID('C','O','N','S')
+-#define BT_BOXSHAPE_CODE MAKE_ID('B','O','X','S')
+-#define BT_QUANTIZED_BVH_CODE MAKE_ID('Q','B','V','H')
+-#define BT_TRIANLGE_INFO_MAP MAKE_ID('T','M','A','P')
+-#define BT_SHAPE_CODE MAKE_ID('S','H','A','P')
+-#define BT_ARRAY_CODE MAKE_ID('A','R','A','Y')
+-#define BT_SBMATERIAL_CODE MAKE_ID('S','B','M','T')
+-#define BT_SBNODE_CODE MAKE_ID('S','B','N','D')
+-#define BT_DNA_CODE MAKE_ID('D','N','A','1')
++#define BT_SOFTBODY_CODE BT_MAKE_ID('S','B','D','Y')
++#define BT_COLLISIONOBJECT_CODE BT_MAKE_ID('C','O','B','J')
++#define BT_RIGIDBODY_CODE BT_MAKE_ID('R','B','D','Y')
++#define BT_CONSTRAINT_CODE BT_MAKE_ID('C','O','N','S')
++#define BT_BOXSHAPE_CODE BT_MAKE_ID('B','O','X','S')
++#define BT_QUANTIZED_BVH_CODE BT_MAKE_ID('Q','B','V','H')
++#define BT_TRIANLGE_INFO_MAP BT_MAKE_ID('T','M','A','P')
++#define BT_SHAPE_CODE BT_MAKE_ID('S','H','A','P')
++#define BT_ARRAY_CODE BT_MAKE_ID('A','R','A','Y')
++#define BT_SBMATERIAL_CODE BT_MAKE_ID('S','B','M','T')
++#define BT_SBNODE_CODE BT_MAKE_ID('S','B','N','D')
++#define BT_DNA_CODE BT_MAKE_ID('D','N','A','1')
+
+
+ struct btPointerUid
Modified: trunk/blender/extern/bullet2/readme.txt
===================================================================
--- trunk/blender/extern/bullet2/readme.txt 2012-05-14 13:28:36 UTC (rev
46626)
+++ trunk/blender/extern/bullet2/readme.txt 2012-05-14 13:31:38 UTC (rev
46627)
@@ -15,3 +15,7 @@
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
Modified: trunk/blender/extern/bullet2/src/LinearMath/btSerializer.h
===================================================================
--- trunk/blender/extern/bullet2/src/LinearMath/btSerializer.h 2012-05-14
13:28:36 UTC (rev 46626)
+++ trunk/blender/extern/bullet2/src/LinearMath/btSerializer.h 2012-05-14
13:31:38 UTC (rev 46627)
@@ -106,23 +106,23 @@
#define BT_HEADER_LENGTH 12
#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined
(__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__)
-# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
+# define BT_MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d)
)
#else
-# define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
+# define BT_MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a)
)
#endif
-#define BT_SOFTBODY_CODE MAKE_ID('S','B','D','Y')
-#define BT_COLLISIONOBJECT_CODE MAKE_ID('C','O','B','J')
-#define BT_RIGIDBODY_CODE MAKE_ID('R','B','D','Y')
-#define BT_CONSTRAINT_CODE MAKE_ID('C','O','N','S')
-#define BT_BOXSHAPE_CODE MAKE_ID('B','O','X','S')
-#define BT_QUANTIZED_BVH_CODE MAKE_ID('Q','B','V','H')
-#define BT_TRIANLGE_INFO_MAP MAKE_ID('T','M','A','P')
-#define BT_SHAPE_CODE MAKE_ID('S','H','A','P')
-#define BT_ARRAY_CODE MAKE_ID('A','R','A','Y')
-#define BT_SBMATERIAL_CODE MAKE_ID('S','B','M','T')
-#define BT_SBNODE_CODE MAKE_ID('S','B','N','D')
-#define BT_DNA_CODE MAKE_ID('D','N','A','1')
+#define BT_SOFTBODY_CODE BT_MAKE_ID('S','B','D','Y')
+#define BT_COLLISIONOBJECT_CODE BT_MAKE_ID('C','O','B','J')
+#define BT_RIGIDBODY_CODE BT_MAKE_ID('R','B','D','Y')
+#define BT_CONSTRAINT_CODE BT_MAKE_ID('C','O','N','S')
+#define BT_BOXSHAPE_CODE BT_MAKE_ID('B','O','X','S')
+#define BT_QUANTIZED_BVH_CODE BT_MAKE_ID('Q','B','V','H')
+#define BT_TRIANLGE_INFO_MAP BT_MAKE_ID('T','M','A','P')
+#define BT_SHAPE_CODE BT_MAKE_ID('S','H','A','P')
+#define BT_ARRAY_CODE BT_MAKE_ID('A','R','A','Y')
+#define BT_SBMATERIAL_CODE BT_MAKE_ID('S','B','M','T')
+#define BT_SBNODE_CODE BT_MAKE_ID('S','B','N','D')
+#define BT_DNA_CODE BT_MAKE_ID('D','N','A','1')
struct btPointerUid
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2012-05-14 13:28:36 UTC
(rev 46626)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2012-05-14 13:31:38 UTC
(rev 46627)
@@ -193,6 +193,12 @@
ffmpeg/AUD_FFMPEGReader.h
ffmpeg/AUD_FFMPEGWriter.h
)
+
+ remove_strict_flags_file(
+ ffmpeg/AUD_FFMPEGFactory.cpp
+ ffmpeg/AUD_FFMPEGReader.cpp
+ ffmpeg/AUD_FFMPEGWriter.cpp
+ )
endif()
if(WITH_SDL)
Modified: trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt 2012-05-14
13:28:36 UTC (rev 46626)
+++ trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt 2012-05-14
13:31:38 UTC (rev 46627)
@@ -96,6 +96,10 @@
${PTHREADS_INCLUDE_DIRS}
)
add_definitions(-DWITH_FFMPEG)
+
+ remove_strict_flags_file(
+ VideoFFmpeg.cpp
+ )
endif()
blender_add_lib(ge_videotex "${SRC}" "${INC}" "${INC_SYS}")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
