From cb65a97347e319c686b136758163d40d4ebbc604 Mon Sep 17 00:00:00 2001 From: Sherief Farouk Date: Mon, 7 Oct 2013 19:32:46 -0400 Subject: [PATCH 1/2] Irrlicht mesh loader is now predicated on the proper preprocessor define (ASSIMP_BUILD_NO_IRRMESH_IMPORTER) as opposed to a similarly named but wrong define (ASSIMP_BUILD_NO_IRR_IMPORTER). --- code/IRRMeshLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/IRRMeshLoader.cpp b/code/IRRMeshLoader.cpp index b27b2eaac..1ee472a1c 100644 --- a/code/IRRMeshLoader.cpp +++ b/code/IRRMeshLoader.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "AssimpPCH.h" -#ifndef ASSIMP_BUILD_NO_IRR_IMPORTER +#ifndef ASSIMP_BUILD_NO_IRRMESH_IMPORTER #include "IRRMeshLoader.h" #include "ParsingUtils.h" @@ -512,4 +512,4 @@ void IRRMeshImporter::InternReadFile( const std::string& pFile, AI_DEBUG_INVALIDATE_PTR(reader); } -#endif // !! ASSIMP_BUILD_NO_IRR_IMPORTER +#endif // !! ASSIMP_BUILD_NO_IRRMESH_IMPORTER From 5334020d175e9f7306f1149563f39f70982c7df8 Mon Sep 17 00:00:00 2001 From: Sherief Farouk Date: Mon, 7 Oct 2013 19:40:21 -0400 Subject: [PATCH 2/2] Irrlicht shared code is now excluded only if both the Irrlicht and Irrlicht Mesh importers are excluded from the build. --- code/IRRShared.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/IRRShared.cpp b/code/IRRShared.cpp index bd95de1d1..f03239398 100644 --- a/code/IRRShared.cpp +++ b/code/IRRShared.cpp @@ -45,7 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "AssimpPCH.h" -#ifndef ASSIMP_BUILD_NO_IRR_IMPORTER +//This section should be excluded only if both the Irrlicht AND the Irrlicht Mesh importers were omitted. +#if !(defined(ASSIMP_BUILD_NO_IRR_IMPORTER) && defined(ASSIMP_BUILD_NO_IRRMESH_IMPORTER)) #include "IRRShared.h" #include "ParsingUtils.h" @@ -497,4 +498,4 @@ aiMaterial* IrrlichtBase::ParseMaterial(unsigned int& matFlags) return mat; } -#endif // !! ASSIMP_BUILD_NO_IRR_IMPORTER +#endif // !(defined(ASSIMP_BUILD_NO_IRR_IMPORTER) && defined(ASSIMP_BUILD_NO_IRRMESH_IMPORTER))