Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #949 from amaury-ml/neon

Fix Arm 64bit detection #949
Christophe 6 years ago
parent
5868657413 9b0a0535ce
commit
4ff530b2a5
1 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 2 2
      glm/detail/setup.hpp

+ 2 - 2
glm/detail/setup.hpp
View File 

@@ -35,9 +35,9 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
 
 // Build model
 
 
-#if defined(__arch64__) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__)
 
+#if defined(_M_ARM64) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__)
 
 #	define GLM_MODEL	GLM_MODEL_64
 
-#elif defined(__i386__) || defined(__ppc__)
 
+#elif defined(__i386__) || defined(__ppc__) || defined(__ILP32__) || defined(_M_ARM)
 
 #	define GLM_MODEL	GLM_MODEL_32
 
 #else
 
 #	define GLM_MODEL	GLM_MODEL_32