Merge pull request #949 from amaury-ml/neon

Fix Arm 64bit detection #949
This commit is contained in:
Christophe 2019-09-12 12:59:33 +02:00 committed by GitHub
commit 4ff530b2a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -35,9 +35,9 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Build model // 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 # 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 # define GLM_MODEL GLM_MODEL_32
#else #else
# define GLM_MODEL GLM_MODEL_32 # define GLM_MODEL GLM_MODEL_32