diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 1464e848..6cf6d075 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -681,7 +681,9 @@ // http://gcc.gnu.org/projects/cxx0x.html // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx -#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG) +#if GLM_PLATFORM == GLM_PLATFORM_ANDROID || GLM_PLATFORM == GLM_PLATFORM_CYGWIN +# define GLM_HAS_CXX11_STL 0 +#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG) # if defined(_LIBCPP_VERSION) && GLM_LANG & GLM_LANG_CXX11_FLAG # define GLM_HAS_CXX11_STL 1 # else