From 7c379193e76561b28919a7fe1b2e9424b01e3a44 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 16 Aug 2018 17:09:32 +0200 Subject: [PATCH] Fixed GLM_HAS_CXX11_STL detection #802 --- glm/detail/setup.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 4c6b8e93..8692f175 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -172,8 +172,11 @@ # else # define GLM_HAS_CXX11_STL 0 # endif +#elif GLM_LANG & GLM_LANG_CXX11_FLAG +# define GLM_HAS_CXX11_STL 1 #else # define GLM_HAS_CXX11_STL ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ + ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \ ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \ ((GLM_PLATFORM != GLM_PLATFORM_WINDOWS) && (GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15)))) #endif