Merge pull request #859 from maniatic0/master

Fix for GLM_HAS_CXX11_STL detection #859
master
Christophe ago%!(EXTRA string=6 years) committed by GitHub
commit 7590260cf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      glm/detail/setup.hpp

@ -143,7 +143,8 @@
#if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED) #if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
# define GLM_HAS_CXX11_STL 0 # define GLM_HAS_CXX11_STL 0
#elif GLM_COMPILER & GLM_COMPILER_CLANG #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 # define GLM_HAS_CXX11_STL 1
# else # else
# define GLM_HAS_CXX11_STL 0 # define GLM_HAS_CXX11_STL 0

Loading…
Cancel
Save