Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed GLM_HAS_CXX11_STL detection #802

Christophe Riccio 7 years ago
parent
fceca6cf19
commit
7c379193e7
1 changed files with 3 additions and 0 deletions
Split View Show Diff Stats
  1. 3 0
      glm/detail/setup.hpp

+ 3 - 0
glm/detail/setup.hpp
View File 

@@ -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