Merge pull request #890 from WroughtIronGames/master

Add fix for IRR vs IRRMESH importer registry issue
2016-05-17 14:35:42 -07:00 · 2016-05-17 14:35:42 -07:00 · 84b9df3182
parent 5168a6c8ca fc5464eb38
commit 84b9df3182
1 changed files with 7 additions and 3 deletions
--- a/code/CMakeLists.txt
+++ b/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
 )