Improved disabling auto detection

This commit is contained in:
Christophe Riccio
2018-08-22 21:43:32 +02:00
parent b1c2cc64fd
commit de4dbc5662
5 changed files with 36 additions and 3 deletions

View File

@@ -80,7 +80,9 @@
# define GLM_LANG_EXT 0
#endif
#if defined(GLM_FORCE_CXX2A)
#if (defined(GLM_FORCE_CXX_UNKNOWN))
# define GLM_LANG 0
#elif defined(GLM_FORCE_CXX2A)
# define GLM_LANG (GLM_LANG_CXX2A | GLM_LANG_EXT)
# define GLM_LANG_STL11_FORCED
#elif defined(GLM_FORCE_CXX17)

View File

@@ -251,7 +251,9 @@
#define GLM_ARCH_MIPS (GLM_ARCH_MIPS_BIT)
#define GLM_ARCH_PPC (GLM_ARCH_PPC_BIT)
#if defined(GLM_FORCE_PURE) || defined(GLM_FORCE_XYZW_ONLY)
#ifdef GLM_FORCE_ARCH_UNKNOWN
# define GLM_ARCH GLM_ARCH_UNKNOWN
#elif defined(GLM_FORCE_PURE) || defined(GLM_FORCE_XYZW_ONLY)
# if defined(__x86_64__) || defined(_M_X64) || defined(_M_IX86) || defined(__i386__)
# define GLM_ARCH (GLM_ARCH_X86)
# elif defined(__arm__ ) || defined(_M_ARM)