Merge pull request #859 from maniatic0/master

Fix for GLM_HAS_CXX11_STL detection #859
ago%!(EXTRA string=6 years) · 7590260cf8
parent 8cd6db11cd 3125f83f16
commit 7590260cf8
1 changed files with 2 additions and 1 deletions
--- 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