Revision: 34787
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34787
Author: campbellbarton
Date: 2011-02-12 06:25:04 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
fix for building with opencollada 833 on linux.
Modified Paths:
--------------
trunk/blender/extern/bullet2/CMakeLists.txt
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/collada/SkinInfo.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/collada/collada.cpp
trunk/blender/source/blender/collada/collada_internal.cpp
trunk/blender/source/blender/collada/collada_utils.cpp
Modified: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt 2011-02-12 05:12:26 UTC (rev
34786)
+++ trunk/blender/extern/bullet2/CMakeLists.txt 2011-02-12 06:25:04 UTC (rev
34787)
@@ -319,7 +319,7 @@
src/btBulletDynamicsCommon.h
)
-if(CMAKE_COMPILER_IS_GNUCC)
+if(CMAKE_COMPILER_IS_GNUCXX)
# needed for gcc 4.6+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
endif()
Modified: trunk/blender/source/blender/collada/AnimationImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationImporter.cpp 2011-02-12
05:12:26 UTC (rev 34786)
+++ trunk/blender/source/blender/collada/AnimationImporter.cpp 2011-02-12
06:25:04 UTC (rev 34787)
@@ -22,6 +22,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
+
#include "DNA_armature_types.h"
#include "ED_keyframing.h"
Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp 2011-02-12
05:12:26 UTC (rev 34786)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp 2011-02-12
06:25:04 UTC (rev 34787)
@@ -22,6 +22,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
+
#include <algorithm>
#include "COLLADAFWUniqueId.h"
Modified: trunk/blender/source/blender/collada/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/collada/CMakeLists.txt 2011-02-12 05:12:26 UTC
(rev 34786)
+++ trunk/blender/source/blender/collada/CMakeLists.txt 2011-02-12 06:25:04 UTC
(rev 34787)
@@ -99,4 +99,9 @@
add_definitions(-DNAN_BUILDINFO)
endif()
+if(CMAKE_COMPILER_IS_GNUCXX)
+ # COLLADAFWArray.h gives error with gcc 4.5
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+endif()
+
blender_add_lib(bf_collada "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp 2011-02-12
05:12:26 UTC (rev 34786)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp 2011-02-12
06:25:04 UTC (rev 34787)
@@ -28,6 +28,9 @@
#include <iostream>
#endif
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
+
#include "COLLADAFWMeshPrimitive.h"
#include "COLLADAFWMeshVertexData.h"
#include "COLLADAFWPolygons.h"
Modified: trunk/blender/source/blender/collada/SkinInfo.cpp
===================================================================
--- trunk/blender/source/blender/collada/SkinInfo.cpp 2011-02-12 05:12:26 UTC
(rev 34786)
+++ trunk/blender/source/blender/collada/SkinInfo.cpp 2011-02-12 06:25:04 UTC
(rev 34787)
@@ -28,6 +28,9 @@
#include <stdint.h>
#endif
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
+
#include "BKE_object.h"
#include "DNA_armature_types.h"
#include "DNA_modifier_types.h"
Modified: trunk/blender/source/blender/collada/TransformReader.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformReader.cpp 2011-02-12
05:12:26 UTC (rev 34786)
+++ trunk/blender/source/blender/collada/TransformReader.cpp 2011-02-12
06:25:04 UTC (rev 34787)
@@ -21,6 +21,8 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
#include "TransformReader.h"
Modified: trunk/blender/source/blender/collada/collada.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada.cpp 2011-02-12 05:12:26 UTC
(rev 34786)
+++ trunk/blender/source/blender/collada/collada.cpp 2011-02-12 06:25:04 UTC
(rev 34787)
@@ -22,6 +22,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
+
#include "DocumentExporter.h"
#include "DocumentImporter.h"
Modified: trunk/blender/source/blender/collada/collada_internal.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.cpp 2011-02-12
05:12:26 UTC (rev 34786)
+++ trunk/blender/source/blender/collada/collada_internal.cpp 2011-02-12
06:25:04 UTC (rev 34787)
@@ -22,6 +22,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/* COLLADABU_ASSERT, may be able to remove later */
#include "collada_internal.h"
UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) {}
Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp 2011-02-12
05:12:26 UTC (rev 34786)
+++ trunk/blender/source/blender/collada/collada_utils.cpp 2011-02-12
06:25:04 UTC (rev 34787)
@@ -22,6 +22,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
+
#include "COLLADAFWGeometry.h"
#include "COLLADAFWMeshPrimitive.h"
#include "COLLADAFWMeshVertexData.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
