mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-22 17:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Arm 64bit detection

Browse Source 
__aarch64__ is the correct way, __arm64__ is for iOS.
But the memory model does not need any of these architecture defines to be fully
relevant. __LP64__ means Long Pointer 64 (ie 64bits), and __ILP32__ is Integer Long Pointer 32 (ie 32bits).
That's enough and avoids errors like __arch64__ (correct way is __aarch64__) but forgets __arm64__ (iOS).
This commit is contained in:
Amaury Le Leyzour 2019-09-09 17:25:05 -07:00
parent 5868657413
commit c35bc3d576
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/detail/setup.hpp
View File

@ -35,12 +35,12 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Build model // Build model
#if defined(__arch64__) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__) #if defined(__LP64__)
# define GLM_MODEL GLM_MODEL_64 # define GLM_MODEL GLM_MODEL_64
#elif defined(__i386__) || defined(__ppc__) #elif defined(__ILP32__)
# define GLM_MODEL GLM_MODEL_32 # define GLM_MODEL GLM_MODEL_32
#else #else
# define GLM_MODEL GLM_MODEL_32 # error "Architecture must be either 32 or 64-bits"
#endif// #endif//
#if !defined(GLM_MODEL) && GLM_COMPILER != 0 #if !defined(GLM_MODEL) && GLM_COMPILER != 0