From dbfa8a4f37635a7c271e9bdc12eacf03c5c6d89f Mon Sep 17 00:00:00 2001
From: kimmi <kimmi@67173fc5-114c-0410-ac8e-9d2fd5bffc1f>
Date: Wed, 16 Mar 2011 22:55:28 +0000
Subject: [PATCH] BUGFIX : Fix an android-specific build issue in the logging.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@919 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
---
 CREDITS             | 3 +++
 code/Importer.cpp   | 2 ++
 include/aiDefines.h | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index b40cd7198..d3f4ff4b6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -100,3 +100,6 @@ Contributed the /samples/SimpleAssimpViewX sample
 
 - Carsten Fuchs
 Contributed a fix for the Normalize method in aiQuaternion.
+
+- dbburgess
+Contributes a Android-specific build issue: log the hardware architecture for ARM.
diff --git a/code/Importer.cpp b/code/Importer.cpp
index 452a81299..9687ceb9b 100644
--- a/code/Importer.cpp
+++ b/code/Importer.cpp
@@ -913,6 +913,8 @@ void WriteLogOpening(const std::string& file)
 		<< " itanium"
 #elif defined(ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE)
 		<< " ppc32"
+#elif defined(ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE)
+		<< " arm"
 #else
 #	error unknown architecture
 #endif
diff --git a/include/aiDefines.h b/include/aiDefines.h
index ff9b1b09c..aaae6601c 100644
--- a/include/aiDefines.h
+++ b/include/aiDefines.h
@@ -240,8 +240,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #		define ASSIMP_BUILD_X86_64BIT_ARCHITECTURE
 #	elif defined(__ppc__)
 #		define ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE
+#   elif defined(__arm__)
+#       define ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE
 #	else
-#		error unknown architecture
+#		error "unknown architecture"
 #	endif
 #else
 #	error unknown compiler