Browse Source

assimp WIP

Mark Sibly 8 years ago
parent
commit
2d6b418ef3

+ 4 - 1
modules/assimp/assimp/include/assimp/config.h

@@ -66,7 +66,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define OPENDDLPARSER_BUILD
 #define OPENDDLPARSER_BUILD
 
 
 //Can't get IFC importer to build...
 //Can't get IFC importer to build...
-#define ASSIMP_BUILD_NO_IFC_IMPORTER 1
+//#define ASSIMP_BUILD_NO_IFC_IMPORTER 1
+
+//Can't get IFC importer to build...
+//#define ASSIMP_BUILD_NO_GLTF_IMPORTER 1
 
 
 
 
 // ###########################################################################
 // ###########################################################################

+ 2 - 2
modules/assimp/makefile.monkey2

@@ -181,8 +181,8 @@ Namespace assimp
 #Import "assimp/code/X3DImporter_Rendering.cpp"
 #Import "assimp/code/X3DImporter_Rendering.cpp"
 #Import "assimp/code/X3DImporter_Shape.cpp"
 #Import "assimp/code/X3DImporter_Shape.cpp"
 #Import "assimp/code/X3DImporter_Texturing.cpp"
 #Import "assimp/code/X3DImporter_Texturing.cpp"
-#Import "assimp/code/glTFImporter.cpp"
-#Import "assimp/code/glTFExporter.cpp"
+'#Import "assimp/code/glTFImporter.cpp"
+'#Import "assimp/code/glTFExporter.cpp"
 #Import "assimp/code/D3MFImporter.cpp"
 #Import "assimp/code/D3MFImporter.cpp"
 #Import "assimp/code/D3MFOpcPackage.cpp"
 #Import "assimp/code/D3MFOpcPackage.cpp"
 #Import "assimp/contrib/ConvertUTF/ConvertUTF.c"
 #Import "assimp/contrib/ConvertUTF/ConvertUTF.c"