forked from bartvdbraak/blender
fix for building with opencollada 833 on linux.
This commit is contained in:
parent
92672d0c1c
commit
0a4eb24ca0
2
extern/bullet2/CMakeLists.txt
vendored
2
extern/bullet2/CMakeLists.txt
vendored
@ -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()
|
||||
|
@ -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"
|
||||
|
@ -22,6 +22,9 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/* COLLADABU_ASSERT, may be able to remove later */
|
||||
#include "COLLADABUPlatform.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "COLLADAFWUniqueId.h"
|
||||
|
@ -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}")
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -21,6 +21,8 @@
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
/* COLLADABU_ASSERT, may be able to remove later */
|
||||
#include "COLLADABUPlatform.h"
|
||||
|
||||
#include "TransformReader.h"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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) {}
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user