diff options
author | 2016-05-05 20:48:39 +0200 | |
---|---|---|
committer | 2016-05-05 20:48:39 +0200 | |
commit | b27adb7b7ccf06e2061eb8e6d30de346b6ab74cf (patch) | |
tree | 01344ce2f73a0d60f8f4b1ae22cd4bec69506bc7 /3rdparty/glm/glm/detail/setup.hpp | |
parent | d3c0199769184210d2f9e9fdcd78bd8fa3920d8d (diff) |
Sync with latest GLM, fixes issue with MINGW (nw)
Diffstat (limited to '3rdparty/glm/glm/detail/setup.hpp')
-rw-r--r-- | 3rdparty/glm/glm/detail/setup.hpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/3rdparty/glm/glm/detail/setup.hpp b/3rdparty/glm/glm/detail/setup.hpp index 4bae915050a..43083743b31 100644 --- a/3rdparty/glm/glm/detail/setup.hpp +++ b/3rdparty/glm/glm/detail/setup.hpp @@ -723,16 +723,31 @@ # define GLM_DEFAULT_CTOR #endif -#if GLM_HAS_CONSTEXPR_PARTIAL +#if GLM_HAS_CONSTEXPR +# define GLM_CONSTEXPR constexpr +# define GLM_CONSTEXPR_CTOR constexpr +# define GLM_RELAXED_CONSTEXPR constexpr +#elif GLM_HAS_CONSTEXPR_PARTIAL # define GLM_CONSTEXPR constexpr +# define GLM_CONSTEXPR_CTOR +# define GLM_RELAXED_CONSTEXPR const #else # define GLM_CONSTEXPR +# define GLM_CONSTEXPR_CTOR +# define GLM_RELAXED_CONSTEXPR const #endif -#if GLM_HAS_CONSTEXPR -# define GLM_RELAXED_CONSTEXPR constexpr +#if GLM_ARCH == GLM_ARCH_PURE +# define GLM_CONSTEXPR_SIMD GLM_CONSTEXPR #else -# define GLM_RELAXED_CONSTEXPR const +# define GLM_CONSTEXPR_SIMD +#endif + +// GCC 4.6 has a bug causing a compiler crash +#if GLM_COMPILER & GLM_COMPILER_GCC +# define GLM_CONSTEXPR_GCC +#else +# define GLM_CONSTEXPR_GCC GLM_CONSTEXPR #endif #ifdef GLM_FORCE_EXPLICIT_CTOR |