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 a8f8801..74f0fc2 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 d462042..836c1fa 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 0dae0b6..e78c195 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 3a2c085..ce20401 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 5faaf12..b42adc0 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 8d342da..4c67137 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 814fda5..10481fc 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 d040e99..241b63e 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 4943aa9..80c8a47 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 b6451c5..c61f8cd 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"