From 4a4af0b80e1e798be8f4bac6c6eaa57e4d008a49 Mon Sep 17 00:00:00 2001 From: Chris Helmich Date: Mon, 22 Jan 2018 11:28:55 +0900 Subject: [PATCH] added flags GLM_CONSTEXPR_CXX14 and GLM_CONSTEXPR_CTOR_CXX14 --- glm/detail/setup.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 8969678c..58cf0b2a 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -742,6 +742,14 @@ # define GLM_RELAXED_CONSTEXPR const #endif +#if GLM_LANG >= GLM_LANG_CXX14 +# define GLM_CONSTEXPR_CXX14 GLM_CONSTEXPR +# define GLM_CONSTEXPR_CTOR_CXX14 GLM_CONSTEXPR_CTOR +#else +# define GLM_CONSTEXPR_CXX14 +# define GLM_CONSTEXPR_CTOR_CXX14 +#endif + #if GLM_ARCH == GLM_ARCH_PURE # define GLM_CONSTEXPR_SIMD GLM_CONSTEXPR_CTOR #else