- Update : Apply simple patch for debian-specific build-fixes: adapt architecture-macro.

- Bugfix : Fix a type in FixNormalStep.
- Bugfix : Fix a missing exception in Obj-Importer, texture coordinate import.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1079 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/Importer.cpp

@@ -528,26 +528,34 @@ void WriteLogOpening(const std::string& file)
 		<< "." 
 		<< aiGetVersionRevision()
 
-#if defined(ASSIMP_BUILD_X86_32BIT_ARCHITECTURE)
-		<< " x86"
-#elif defined(ASSIMP_BUILD_X86_64BIT_ARCHITECTURE)
-		<< " amd64"
-#elif defined(ASSIMP_BUILD_IA_64BIT_ARCHITECTURE)
-		<< " itanium"
-#elif defined(ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE)
-		<< " ppc32"
-#elif defined(ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE)
-		<< " arm"
+		<< " "
+#if defined(ASSIMP_BUILD_ARCHITECTURE)
+		<< ASSIMP_BUILD_ARCHITECTURE
+#elif defined(_M_IX86) || defined(__x86_32__) || defined(__i386__)
+		<< "x86"
+#elif defined(_M_X64) || defined(__x86_64__) 
+		<< "amd64"
+#elif defined(_M_IA64) || defined(__ia64__)
+		<< "itanium"
+#elif defined(__ppc__) || defined(__powerpc__)
+		<< "ppc32"
+#elif defined(__powerpc64__)
+		<< "ppc64"
+#elif defined(__arm__)
+		<< "arm"
 #else
-#	error unknown architecture
+	<< "<unknown architecture>"
 #endif
 
-#if defined(_MSC_VER)
-		<< " msvc"
+		<< " "
+#if defined(ASSIMP_BUILD_COMPILER)
+		<< ASSIMP_BUILD_COMPILER
+#elif defined(_MSC_VER)
+		<< "msvc"
 #elif defined(__GNUC__)
-		<< " gcc"
+		<< "gcc"
 #else
-#	error unknown compiler
+		<< "<unknown compiler>"
 #endif
 
 #ifndef NDEBUG