From 3125f83f1645c96c66285a492b8c05464dc9f681 Mon Sep 17 00:00:00 2001 From: Christian Oliveros Date: Thu, 17 Jan 2019 10:51:12 -0400 Subject: [PATCH] Fix for GLM_HAS_CXX11_STL detection Fix to the bug with the GLM_HAS_CXX11_STL detection using Clang and VS Toolchain on Windows due to the lack of libc++ on Windows. --- glm/detail/setup.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index d68dfe22..e85804e2 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -143,7 +143,8 @@ #if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED) # define GLM_HAS_CXX11_STL 0 #elif GLM_COMPILER & GLM_COMPILER_CLANG -# if (defined(_LIBCPP_VERSION) && GLM_LANG & GLM_LANG_CXX11_FLAG) || defined(GLM_LANG_STL11_FORCED) +# if ((defined(_LIBCPP_VERSION) || defined(_MSC_VER)) && GLM_LANG & GLM_LANG_CXX11_FLAG) || \ + defined(GLM_LANG_STL11_FORCED) # define GLM_HAS_CXX11_STL 1 # else # define GLM_HAS_CXX11_STL 0