2
0
Richard Selneck 9 жил өмнө
parent
commit
86a636fbbf

+ 7 - 3
code/CMakeLists.txt

@@ -273,12 +273,16 @@ ADD_ASSIMP_IMPORTER(HMP
   HalfLifeFileData.h
 )
 
-#FIXME: allow to set IRRMESH by option
+ADD_ASSIMP_IMPORTER(IRRMESH
+  IRRMeshLoader.cpp
+  IRRMeshLoader.h
+  IRRShared.cpp
+  IRRShared.h
+)
+
 ADD_ASSIMP_IMPORTER(IRR
   IRRLoader.cpp
   IRRLoader.h
-  IRRMeshLoader.cpp
-  IRRMeshLoader.h
   IRRShared.cpp
   IRRShared.h
 )

+ 1 - 1
code/ImporterRegistry.cpp

@@ -253,7 +253,7 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
 #if (!defined ASSIMP_BUILD_NO_BVH_IMPORTER)
     out.push_back( new BVHLoader());
 #endif
-#if (!defined ASSIMP_BUILD_NO_IRR_IMPORTER)
+#if (!defined ASSIMP_BUILD_NO_IRRMESH_IMPORTER)
     out.push_back( new IRRMeshImporter());
 #endif
 #if (!defined ASSIMP_BUILD_NO_IRR_IMPORTER)