fix for building with opencollada 833 on linux.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 12 Feb 2011 06:25:04 +0000 (06:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 12 Feb 2011 06:25:04 +0000 (06:25 +0000)
extern/bullet2/CMakeLists.txt
source/blender/collada/AnimationImporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/CMakeLists.txt
source/blender/collada/MeshImporter.cpp
source/blender/collada/SkinInfo.cpp
source/blender/collada/TransformReader.cpp
source/blender/collada/collada.cpp
source/blender/collada/collada_internal.cpp
source/blender/collada/collada_utils.cpp

index a8f8801af702e6510a435e541a7eeea129549ec0..74f0fc2ab56934701971f333aea0fec769d65ba2 100644 (file)
@@ -319,7 +319,7 @@ set(SRC
        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()
index d462042b3f6e7ba5725360240838efc6236d4efa..836c1fae5dfe8ed01f6c0446340b1c9207b5643b 100644 (file)
@@ -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"
index 0dae0b6b9cbc4ab9c5a32aef26f792222b8012f2..e78c1950d33fdc84032bff3f0dde34aa06057b99 100644 (file)
@@ -22,6 +22,9 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
+
 #include <algorithm>
 
 #include "COLLADAFWUniqueId.h"
index 3a2c085335be8a84fc8ed7d67794c0ea8d3f7f21..ce204013f3d50f6d7edbca61b17c7bfd24ed3bc5 100644 (file)
@@ -99,4 +99,9 @@ if(WITH_BUILDINFO)
        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}")
index 5faaf123bc79f41e922dbe0e3207f84e9b95bda3..b42adc03785ea4b7ef40c86bb8a053b09fc09e33 100644 (file)
@@ -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"
index 8d342daf486621574fbbf66a5918dbd91bb9b30c..4c6713736fb60550d68dcd894583643579f3bce4 100644 (file)
@@ -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"
index 814fda58e3c03f1814addd381fe07ef2a41dfcda..10481fcafbe7c04610e904dcb218c62700dae846 100644 (file)
@@ -21,6 +21,8 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+/* COLLADABU_ASSERT, may be able to remove later */
+#include "COLLADABUPlatform.h"
 
 #include "TransformReader.h"
 
index d040e99c4b9f68794ca45dfa950c8a8766604b22..241b63eeade04a65a091169313862eb6606d9514 100644 (file)
@@ -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"
 
index 4943aa965469fc3990dfbbeb4af6ca1dd28d23f0..80c8a47088838d18c5110a5ac1ec76e1bf6b37ac 100644 (file)
@@ -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) {}
index b6451c58a018d12ad2066eeb2a402c88cf3dbb2f..c61f8cda3492a105a1401b0cedcc89813c1d0e22 100644 (file)
@@ -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"