From 86a636fbbf2cfe2468fc4ac2a00232f5653f1aba Mon Sep 17 00:00:00 2001 From: Richard Selneck Date: Mon, 9 May 2016 18:26:18 -0400 Subject: [PATCH] Add in IRRMESH option --- code/CMakeLists.txt | 10 +++++++--- code/ImporterRegistry.cpp | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 89bcdf9e1..133b93d58 100644 --- 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 ) diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp index 2decee8a0..380028f07 100644 --- a/code/ImporterRegistry.cpp +++ b/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)