v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
pull/1/head
kimmi 2011-03-16 22:55:28 +00:00
parent 071b786cd2
commit dbfa8a4f37
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CREDITS
View File

@ -100,3 +100,6 @@ Contributed the /samples/SimpleAssimpViewX sample
- Carsten Fuchs - Carsten Fuchs
Contributed a fix for the Normalize method in aiQuaternion. Contributed a fix for the Normalize method in aiQuaternion.
- dbburgess
Contributes a Android-specific build issue: log the hardware architecture for ARM.

2
code/Importer.cpp
View File

@ -913,6 +913,8 @@ void WriteLogOpening(const std::string& file)
<< " itanium" << " itanium"
#elif defined(ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE) #elif defined(ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE)
<< " ppc32" << " ppc32"
#elif defined(ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE)
<< " arm"
#else #else
# error unknown architecture # error unknown architecture
#endif #endif

4
include/aiDefines.h
View File

@ -240,8 +240,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# define ASSIMP_BUILD_X86_64BIT_ARCHITECTURE # define ASSIMP_BUILD_X86_64BIT_ARCHITECTURE
# elif defined(__ppc__) # elif defined(__ppc__)
# define ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE # define ASSIMP_BUILD_PPC_32BIT_ARCHITECTURE
# elif defined(__arm__)
# define ASSIMP_BUILD_ARM_32BIT_ARCHITECTURE
# else # else
# error unknown architecture # error "unknown architecture"
# endif # endif
#else #else
# error unknown compiler # error unknown compiler